From f2380399335121546512841c3f9f1b1f0cf8c866 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Sat, 9 May 2020 20:08:21 +0200
Subject: compact namespace in slideshow

Change-Id: Ic61e68312314cdfb30f89cafe9255ee8f0b0a081
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93875
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 slideshow/source/engine/effectrewinder.hxx         |  4 ++--
 .../source/engine/rehearsetimingsactivity.hxx      |  2 +-
 slideshow/source/engine/shapes/appletshape.hxx     |  5 +----
 slideshow/source/engine/shapes/backgroundshape.hxx |  5 +----
 slideshow/source/engine/shapes/mediashape.hxx      |  5 +----
 slideshow/source/engine/shapes/viewappletshape.hxx | 21 ++++++++---------
 slideshow/source/engine/shapes/viewmediashape.hxx  | 26 ++++++++++++----------
 slideshow/source/engine/slide/slideanimations.hxx  |  5 +----
 .../engine/transitions/transitionfactorytab.hxx    |  4 ++--
 slideshow/source/inc/eventmultiplexer.hxx          |  5 +----
 slideshow/source/inc/framerate.hxx                 |  4 ++--
 slideshow/source/inc/mouseeventhandler.hxx         |  5 +----
 slideshow/source/inc/shapelistenereventhandler.hxx | 14 +++++++-----
 slideshow/source/inc/shapemanager.hxx              |  4 +---
 slideshow/source/inc/shapemaps.hxx                 |  5 +----
 slideshow/source/inc/slide.hxx                     |  5 +++--
 slideshow/source/inc/slidebitmap.hxx               |  5 +----
 slideshow/source/inc/slideshowcontext.hxx          |  5 +----
 slideshow/source/inc/tools.hxx                     |  8 +++----
 slideshow/source/inc/unoview.hxx                   |  5 +----
 slideshow/source/inc/unoviewcontainer.hxx          |  5 +----
 21 files changed, 58 insertions(+), 89 deletions(-)

diff --git a/slideshow/source/engine/effectrewinder.hxx b/slideshow/source/engine/effectrewinder.hxx
index 57f7e2339cd8..69891172e3c9 100644
--- a/slideshow/source/engine/effectrewinder.hxx
+++ b/slideshow/source/engine/effectrewinder.hxx
@@ -29,7 +29,7 @@
 #include <functional>
 #include <memory>
 
-namespace slideshow { namespace internal {
+namespace slideshow::internal {
 
 class EventMultiplexer;
 class EventQueue;
@@ -164,7 +164,7 @@ private:
         const ::std::function<void ()>& rPreviousSlideFunctor);
 };
 
-} } // end of namespace ::slideshow::internal
+} // end of namespace ::slideshow::internal
 
 #endif
 
diff --git a/slideshow/source/engine/rehearsetimingsactivity.hxx b/slideshow/source/engine/rehearsetimingsactivity.hxx
index 9c7ebdc486bd..630f9c48fe61 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.hxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.hxx
@@ -33,7 +33,7 @@
 #include <memory>
 
 namespace vcl { class Font; }
-namespace canvas{ namespace tools{ class ElapsedTime; }}
+namespace canvas::tools{ class ElapsedTime; }
 namespace cppcanvas{ class CustomSprite; }
 namespace basegfx
 {
diff --git a/slideshow/source/engine/shapes/appletshape.hxx b/slideshow/source/engine/shapes/appletshape.hxx
index 84d5f07d1ac2..49bc81f822fa 100644
--- a/slideshow/source/engine/shapes/appletshape.hxx
+++ b/slideshow/source/engine/shapes/appletshape.hxx
@@ -23,10 +23,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace drawing
-{
-    class XShape;
-} } } }
+namespace com::sun::star::drawing { class XShape; }
 
 namespace slideshow
 {
diff --git a/slideshow/source/engine/shapes/backgroundshape.hxx b/slideshow/source/engine/shapes/backgroundshape.hxx
index 0ded09bd8983..988dba08a22a 100644
--- a/slideshow/source/engine/shapes/backgroundshape.hxx
+++ b/slideshow/source/engine/shapes/backgroundshape.hxx
@@ -24,10 +24,7 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace drawing
-{
-    class XDrawPage;
-} } } }
+namespace com::sun::star::drawing { class XDrawPage; }
 
 namespace slideshow
 {
diff --git a/slideshow/source/engine/shapes/mediashape.hxx b/slideshow/source/engine/shapes/mediashape.hxx
index 01f7b1ccf607..44667cd21018 100644
--- a/slideshow/source/engine/shapes/mediashape.hxx
+++ b/slideshow/source/engine/shapes/mediashape.hxx
@@ -24,10 +24,7 @@
 #include <memory>
 
 
-namespace com { namespace sun { namespace star { namespace drawing
-{
-    class XShape;
-} } } }
+namespace com::sun::star::drawing { class XShape; }
 
 namespace slideshow
 {
diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx b/slideshow/source/engine/shapes/viewappletshape.hxx
index 102b8de8e70f..5d1b30743bef 100644
--- a/slideshow/source/engine/shapes/viewappletshape.hxx
+++ b/slideshow/source/engine/shapes/viewappletshape.hxx
@@ -27,17 +27,18 @@
 
 #include <viewlayer.hxx>
 
-namespace com { namespace sun { namespace star {
-namespace frame {
-    class XSynchronousFrameLoader;
-    class XFrame2;
-}
-namespace uno {
-    class XComponentContext;
+namespace com::sun::star {
+    namespace frame {
+        class XSynchronousFrameLoader;
+        class XFrame2;
+    }
+    namespace uno {
+        class XComponentContext;
+    }
+    namespace drawing {
+        class XShape;
+    }
 }
-namespace drawing {
-    class XShape;
-}}}}
 
 namespace slideshow
 {
diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx
index cc5386346448..549e3902228a 100644
--- a/slideshow/source/engine/shapes/viewmediashape.hxx
+++ b/slideshow/source/engine/shapes/viewmediashape.hxx
@@ -32,19 +32,21 @@
 class SystemChildWindow;
 namespace vcl { class Window; }
 
-namespace com { namespace sun { namespace star { namespace drawing {
-    class XShape;
-}
-namespace media {
-    class XPlayer;
-    class XPlayerWindow;
-}
-namespace uno {
-    class XComponentContext;
+namespace com::sun::star {
+    namespace drawing {
+        class XShape;
+    }
+    namespace media {
+        class XPlayer;
+        class XPlayerWindow;
+    }
+    namespace uno {
+        class XComponentContext;
+    }
+    namespace beans{
+        class XPropertySet;
+    }
 }
-namespace beans{
-    class XPropertySet;
-} } } }
 
 namespace slideshow
 {
diff --git a/slideshow/source/engine/slide/slideanimations.hxx b/slideshow/source/engine/slide/slideanimations.hxx
index 6d69d9593417..67bc6e036951 100644
--- a/slideshow/source/engine/slide/slideanimations.hxx
+++ b/slideshow/source/engine/slide/slideanimations.hxx
@@ -26,10 +26,7 @@
 #include <slideshowcontext.hxx>
 #include <animationnode.hxx>
 
-namespace com { namespace sun { namespace star { namespace animations
-{
-    class XAnimationNode;
-} } } }
+namespace com::sun::star::animations { class XAnimationNode; }
 
 
 /* Definition of SlideAnimations class */
diff --git a/slideshow/source/engine/transitions/transitionfactorytab.hxx b/slideshow/source/engine/transitions/transitionfactorytab.hxx
index 8670384fd52a..157dfec47e44 100644
--- a/slideshow/source/engine/transitions/transitionfactorytab.hxx
+++ b/slideshow/source/engine/transitions/transitionfactorytab.hxx
@@ -24,7 +24,7 @@
 
 #include <sal/types.h>
 
-namespace slideshow { namespace internal {
+namespace slideshow::internal {
 
 struct TransitionInfo;
 
@@ -33,7 +33,7 @@ TransitionInfo const * getTransitionInfo(
 
 TransitionInfo const * getRandomTransitionInfo();
 
-} }
+}
 
 #endif
 
diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx
index 7756fe965d3b..9d84a97c9323 100644
--- a/slideshow/source/inc/eventmultiplexer.hxx
+++ b/slideshow/source/inc/eventmultiplexer.hxx
@@ -31,10 +31,7 @@
 
 #include "unoview.hxx"
 
-namespace com { namespace sun { namespace star { namespace drawing
-{
-    class XShape;
-} } } }
+namespace com::sun::star::drawing { class XShape; }
 
 namespace slideshow {
 namespace internal {
diff --git a/slideshow/source/inc/framerate.hxx b/slideshow/source/inc/framerate.hxx
index 224493a01191..af861dce60c8 100644
--- a/slideshow/source/inc/framerate.hxx
+++ b/slideshow/source/inc/framerate.hxx
@@ -22,7 +22,7 @@
 
 #include <sal/types.h>
 
-namespace slideshow { namespace internal {
+namespace slideshow::internal {
 
 /** Some frame rate related data.
 */
@@ -40,7 +40,7 @@ public:
     static const sal_Int32 PreferredFramesPerSecond = 50;
 };
 
-} } // end of namespace slideshow::internal
+} // end of namespace slideshow::internal
 
 #endif
 
diff --git a/slideshow/source/inc/mouseeventhandler.hxx b/slideshow/source/inc/mouseeventhandler.hxx
index 485cc34d3ff5..926a1acda820 100644
--- a/slideshow/source/inc/mouseeventhandler.hxx
+++ b/slideshow/source/inc/mouseeventhandler.hxx
@@ -24,10 +24,7 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace awt
-{
-    struct MouseEvent;
-} } } }
+namespace com::sun::star::awt { struct MouseEvent; }
 
 
 /* Definition of MouseEventHandler interface */
diff --git a/slideshow/source/inc/shapelistenereventhandler.hxx b/slideshow/source/inc/shapelistenereventhandler.hxx
index 81bd0c1f1b87..386671132e93 100644
--- a/slideshow/source/inc/shapelistenereventhandler.hxx
+++ b/slideshow/source/inc/shapelistenereventhandler.hxx
@@ -23,12 +23,14 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace drawing
-{
-    class XShape;
-} namespace presentation {
-    class XShapeEventListener;
-} } } }
+namespace com::sun::star {
+    namespace drawing {
+        class XShape;
+    }
+    namespace presentation {
+        class XShapeEventListener;
+    }
+}
 
 /* Definition of ShapeListenerEventHandler interface */
 
diff --git a/slideshow/source/inc/shapemanager.hxx b/slideshow/source/inc/shapemanager.hxx
index fee51cfb6afd..ef2e40de6466 100644
--- a/slideshow/source/inc/shapemanager.hxx
+++ b/slideshow/source/inc/shapemanager.hxx
@@ -24,9 +24,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <memory>
 
-namespace com {  namespace sun { namespace star { namespace drawing {
-    class XShape;
-} } } }
+namespace com::sun::star::drawing { class XShape; }
 
 /* Definition of ShapeManager interface */
 
diff --git a/slideshow/source/inc/shapemaps.hxx b/slideshow/source/inc/shapemaps.hxx
index 83d665af7598..43476e05b81c 100644
--- a/slideshow/source/inc/shapemaps.hxx
+++ b/slideshow/source/inc/shapemaps.hxx
@@ -26,10 +26,7 @@
 #include <memory>
 #include <map>
 
-namespace com { namespace sun { namespace star { namespace drawing
-{
-    class XShape;
-} } } }
+namespace com::sun::star::drawing { class XShape; }
 
 /* Definition of two shape maps */
 
diff --git a/slideshow/source/inc/slide.hxx b/slideshow/source/inc/slide.hxx
index 8f7c6bb33725..8350751fa83f 100644
--- a/slideshow/source/inc/slide.hxx
+++ b/slideshow/source/inc/slide.hxx
@@ -26,7 +26,7 @@
 
 #include <memory>
 
-namespace com {  namespace sun { namespace star {
+namespace com::sun::star {
     namespace drawing {
         class XDrawPage;
         class XDrawPagesSupplier;
@@ -36,7 +36,8 @@ namespace com {  namespace sun { namespace star {
     }
     namespace animations {
         class XAnimationNode;
-} } } }
+    }
+}
 
 namespace basegfx
 {
diff --git a/slideshow/source/inc/slidebitmap.hxx b/slideshow/source/inc/slidebitmap.hxx
index f149138c4a7c..f5248a8061e3 100644
--- a/slideshow/source/inc/slidebitmap.hxx
+++ b/slideshow/source/inc/slidebitmap.hxx
@@ -29,10 +29,7 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace rendering
-{
-    class XBitmap;
-} } } }
+namespace com::sun::star::rendering { class XBitmap; }
 
 
 /* Definition of SlideBitmap class */
diff --git a/slideshow/source/inc/slideshowcontext.hxx b/slideshow/source/inc/slideshowcontext.hxx
index 904b8965543e..6d14fb34b1b2 100644
--- a/slideshow/source/inc/slideshowcontext.hxx
+++ b/slideshow/source/inc/slideshowcontext.hxx
@@ -23,10 +23,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <memory>
 
-namespace com{ namespace sun{ namespace star{ namespace uno
-{
-    class XComponentContext;
-}}}}
+namespace com::sun::star::uno { class XComponentContext; }
 
 
 namespace slideshow
diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index 39ee1f8b83e7..632933feecd6 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -39,9 +39,7 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace beans {
-    struct NamedValue;
-} } } }
+namespace com::sun::star::beans { struct NamedValue; }
 namespace basegfx
 {
     class B2DRange;
@@ -84,7 +82,7 @@ namespace slideshow
     }
 }
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
 
         template <typename T>
         inline ::std::size_t hash_value(
@@ -96,7 +94,7 @@ namespace com { namespace sun { namespace star { namespace uno {
             return slideshow::internal::hash<void *>()(xRoot.get());
         }
 
-} } } }
+}
 
 namespace slideshow
 {
diff --git a/slideshow/source/inc/unoview.hxx b/slideshow/source/inc/unoview.hxx
index bf19e72e1868..e1ec82549354 100644
--- a/slideshow/source/inc/unoview.hxx
+++ b/slideshow/source/inc/unoview.hxx
@@ -25,10 +25,7 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace presentation
-{
-    class XSlideShowView;
-} } } }
+namespace com::sun::star::presentation { class XSlideShowView; }
 
 
 /* Definition of UnoView interface */
diff --git a/slideshow/source/inc/unoviewcontainer.hxx b/slideshow/source/inc/unoviewcontainer.hxx
index 159fd0707dfa..90c081904cd8 100644
--- a/slideshow/source/inc/unoviewcontainer.hxx
+++ b/slideshow/source/inc/unoviewcontainer.hxx
@@ -25,10 +25,7 @@
 #include "unoview.hxx"
 
 
-namespace com { namespace sun { namespace star { namespace presentation
-{
-    class XSlideShowView;
-} } } }
+namespace com::sun::star::presentation { class XSlideShowView; }
 
 /* Definition of UnoViewContainer class */
 
-- 
cgit