diff options
Diffstat (limited to 'slideshow/source/inc')
69 files changed, 107 insertions, 283 deletions
diff --git a/slideshow/source/inc/activitiesfactory.hxx b/slideshow/source/inc/activitiesfactory.hxx index 19ef963bbdc3..69852489c54a 100644 --- a/slideshow/source/inc/activitiesfactory.hxx +++ b/slideshow/source/inc/activitiesfactory.hxx @@ -40,10 +40,7 @@ /* Definition of ActivitiesFactory class */ -namespace slideshow { -namespace internal { - -namespace ActivitiesFactory +namespace slideshow::internal::ActivitiesFactory { /// Collection of common factory parameters struct CommonParameters @@ -303,10 +300,8 @@ namespace ActivitiesFactory const CommonParameters& rParms, const NumberAnimationSharedPtr& rAnimator, bool bDirectionForward ); -} -} // namespace internal -} // namespace presentation +} // namespace presentation::internal #endif // INCLUDED_SLIDESHOW_SOURCE_INC_ACTIVITIESFACTORY_HXX diff --git a/slideshow/source/inc/activitiesqueue.hxx b/slideshow/source/inc/activitiesqueue.hxx index b4f88b1b39d1..7169c46f7cf3 100644 --- a/slideshow/source/inc/activitiesqueue.hxx +++ b/slideshow/source/inc/activitiesqueue.hxx @@ -31,9 +31,7 @@ /* Definition of ActivitiesQueue class */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** This class handles the XSprite updates needed for animations, such as moves, scales etc. You can add @@ -110,7 +108,6 @@ namespace slideshow // current frame has been displayed. }; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_ACTIVITIESQUEUE_HXX diff --git a/slideshow/source/inc/activity.hxx b/slideshow/source/inc/activity.hxx index 5627206a56c0..5de30c79d9eb 100644 --- a/slideshow/source/inc/activity.hxx +++ b/slideshow/source/inc/activity.hxx @@ -27,9 +27,7 @@ /* Definition of Activity interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { class Activity : public Disposable, public virtual SharedPtrAble @@ -84,7 +82,6 @@ namespace slideshow typedef ::std::shared_ptr< Activity > ActivitySharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_ACTIVITY_HXX diff --git a/slideshow/source/inc/animatableshape.hxx b/slideshow/source/inc/animatableshape.hxx index b2dd7753fa90..7cefad0f6086 100644 --- a/slideshow/source/inc/animatableshape.hxx +++ b/slideshow/source/inc/animatableshape.hxx @@ -25,9 +25,7 @@ #include "shape.hxx" -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Represents an animatable shape. @@ -74,7 +72,6 @@ namespace slideshow typedef ::std::shared_ptr< AnimatableShape > AnimatableShapeSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATABLESHAPE_HXX diff --git a/slideshow/source/inc/animatedsprite.hxx b/slideshow/source/inc/animatedsprite.hxx index 80fcc07a6789..18d4eecb2a6d 100644 --- a/slideshow/source/inc/animatedsprite.hxx +++ b/slideshow/source/inc/animatedsprite.hxx @@ -32,9 +32,7 @@ /* Definition of AnimatedSprite class */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** This class provides the sprite for animated shapes. @@ -153,7 +151,6 @@ namespace slideshow typedef ::std::shared_ptr< AnimatedSprite > AnimatedSpriteSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATEDSPRITE_HXX diff --git a/slideshow/source/inc/animation.hxx b/slideshow/source/inc/animation.hxx index b925e2ecf4c7..a9264d76b79a 100644 --- a/slideshow/source/inc/animation.hxx +++ b/slideshow/source/inc/animation.hxx @@ -27,9 +27,7 @@ /* Definition of Animation interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface defining a generic animation. @@ -79,7 +77,6 @@ namespace slideshow virtual void end() = 0; }; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATION_HXX diff --git a/slideshow/source/inc/animationactivity.hxx b/slideshow/source/inc/animationactivity.hxx index 95d0fd02c8b1..20454aa59ed7 100644 --- a/slideshow/source/inc/animationactivity.hxx +++ b/slideshow/source/inc/animationactivity.hxx @@ -27,9 +27,7 @@ /* Definition of AnimationActivity interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Extends the Activity interface with animation-specific functions @@ -61,7 +59,6 @@ namespace slideshow typedef ::std::shared_ptr< AnimationActivity > AnimationActivitySharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATIONACTIVITY_HXX diff --git a/slideshow/source/inc/animationeventhandler.hxx b/slideshow/source/inc/animationeventhandler.hxx index 2d955e6b63cd..0c66ffd5aaf8 100644 --- a/slideshow/source/inc/animationeventhandler.hxx +++ b/slideshow/source/inc/animationeventhandler.hxx @@ -26,9 +26,7 @@ /* Definition of AnimationEventHandler interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface for handling animation events. @@ -57,7 +55,6 @@ namespace slideshow typedef ::std::shared_ptr< AnimationEventHandler > AnimationEventHandlerSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATIONEVENTHANDLER_HXX diff --git a/slideshow/source/inc/animationfactory.hxx b/slideshow/source/inc/animationfactory.hxx index 7d2f205c63a5..db24dbb55094 100644 --- a/slideshow/source/inc/animationfactory.hxx +++ b/slideshow/source/inc/animationfactory.hxx @@ -32,9 +32,7 @@ /* Definition of AnimationFactory class */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Factory for Animation objects @@ -127,7 +125,7 @@ namespace slideshow const ::basegfx::B2DVector& rSlideSize, int nFlags); } - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATIONFACTORY_HXX diff --git a/slideshow/source/inc/animationnode.hxx b/slideshow/source/inc/animationnode.hxx index 34eca1da91ed..ea08b552b4fc 100644 --- a/slideshow/source/inc/animationnode.hxx +++ b/slideshow/source/inc/animationnode.hxx @@ -25,8 +25,7 @@ #include <memory> -namespace slideshow { -namespace internal { +namespace slideshow::internal { class AnimationNode; typedef ::std::shared_ptr< AnimationNode > AnimationNodeSharedPtr; @@ -152,8 +151,7 @@ public: virtual bool hasPendingAnimation() const = 0; }; -} // namespace internal -} // namespace presentation +} // namespace presentation::internal #endif // INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATIONNODE_HXX diff --git a/slideshow/source/inc/animationnodefactory.hxx b/slideshow/source/inc/animationnodefactory.hxx index 681cc8518451..af424ec5092b 100644 --- a/slideshow/source/inc/animationnodefactory.hxx +++ b/slideshow/source/inc/animationnodefactory.hxx @@ -29,14 +29,10 @@ #include "slideshowcontext.hxx" -namespace slideshow +namespace slideshow::internal::AnimationNodeFactory { - namespace internal - { - /* Definition of AnimationNodeFactory class */ + /* Definition of AnimationNodeFactory class */ - namespace AnimationNodeFactory - { /** Create an AnimationNode for the given XAnimationNode */ AnimationNodeSharedPtr createAnimationNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode, @@ -50,8 +46,7 @@ namespace slideshow #else # define SHOW_NODE_TREE(a) #endif - } - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATIONNODEFACTORY_HXX diff --git a/slideshow/source/inc/attributableshape.hxx b/slideshow/source/inc/attributableshape.hxx index 4c250e67d14e..d903c3b2abbb 100644 --- a/slideshow/source/inc/attributableshape.hxx +++ b/slideshow/source/inc/attributableshape.hxx @@ -26,9 +26,7 @@ #include "shapeattributelayer.hxx" #include "doctreenodesupplier.hxx" -namespace slideshow -{ - namespace internal +namespace slideshow::internal { // forward declaration necessary, because methods use AttributableShapeSharedPtr class AttributableShape; @@ -214,7 +212,7 @@ namespace slideshow */ virtual bool revokeSubset( const AttributableShapeSharedPtr& rShape ) = 0; }; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_ATTRIBUTABLESHAPE_HXX diff --git a/slideshow/source/inc/attributemap.hxx b/slideshow/source/inc/attributemap.hxx index 6ab9c24e7b77..1cd9b0f300ae 100644 --- a/slideshow/source/inc/attributemap.hxx +++ b/slideshow/source/inc/attributemap.hxx @@ -24,9 +24,7 @@ /* Definition of AttributeMap helper function */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Type of to-be-animated attribute. @@ -65,7 +63,7 @@ namespace slideshow mapping table. */ AttributeType mapAttributeName( const OUString& rAttrName ); - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_ATTRIBUTEMAP_HXX diff --git a/slideshow/source/inc/basecontainernode.hxx b/slideshow/source/inc/basecontainernode.hxx index 8be89a27f01e..79dbe3f2f46d 100644 --- a/slideshow/source/inc/basecontainernode.hxx +++ b/slideshow/source/inc/basecontainernode.hxx @@ -21,8 +21,7 @@ #include "basenode.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { class BaseContainerNode; typedef ::std::shared_ptr< BaseContainerNode > BaseContainerNodeSharedPtr; @@ -94,8 +93,7 @@ private: const bool mbDurationIndefinite; }; -} // namespace interface -} // namespace presentation +} // namespace presentation::interface #endif diff --git a/slideshow/source/inc/basenode.hxx b/slideshow/source/inc/basenode.hxx index 27545dc877e0..668d9de93ad6 100644 --- a/slideshow/source/inc/basenode.hxx +++ b/slideshow/source/inc/basenode.hxx @@ -30,8 +30,7 @@ #include <vector> -namespace slideshow { -namespace internal { +namespace slideshow::internal { /** Context for every node. @@ -205,8 +204,7 @@ private: const bool mbIsMainSequenceRootNode; }; -} // namespace internal -} // namespace slideshow +} // namespace slideshow::internal #endif diff --git a/slideshow/source/inc/boolanimation.hxx b/slideshow/source/inc/boolanimation.hxx index 16b9271eaeb9..79744bc62e03 100644 --- a/slideshow/source/inc/boolanimation.hxx +++ b/slideshow/source/inc/boolanimation.hxx @@ -25,9 +25,7 @@ /* Definition of BoolAnimation interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface defining a bool animation. @@ -63,7 +61,6 @@ namespace slideshow typedef ::std::shared_ptr< BoolAnimation > BoolAnimationSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_BOOLANIMATION_HXX diff --git a/slideshow/source/inc/coloranimation.hxx b/slideshow/source/inc/coloranimation.hxx index 77d394572aaf..21105166b46f 100644 --- a/slideshow/source/inc/coloranimation.hxx +++ b/slideshow/source/inc/coloranimation.hxx @@ -26,9 +26,7 @@ /* Definition of ColorAnimation interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface defining a color animation. @@ -63,7 +61,6 @@ namespace slideshow typedef ::std::shared_ptr< ColorAnimation > ColorAnimationSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_COLORANIMATION_HXX diff --git a/slideshow/source/inc/cursormanager.hxx b/slideshow/source/inc/cursormanager.hxx index b470020abae8..cfd5f0a74205 100644 --- a/slideshow/source/inc/cursormanager.hxx +++ b/slideshow/source/inc/cursormanager.hxx @@ -25,9 +25,7 @@ /* Definition of CursorManager interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface for handling the view cursor. @@ -55,7 +53,6 @@ namespace slideshow virtual void resetCursor() = 0; }; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_CURSORMANAGER_HXX diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx index 9585910bf689..27bdd5aab403 100644 --- a/slideshow/source/inc/delayevent.hxx +++ b/slideshow/source/inc/delayevent.hxx @@ -23,8 +23,7 @@ #include <functional> -namespace slideshow { -namespace internal { +namespace slideshow::internal { /** Event, which delays the functor call the given amount of time */ @@ -134,8 +133,7 @@ inline EventSharedPtr makeDelay_( #endif // OSL_DEBUG_LEVEL <= 1 -} // namespace internal -} // namespace presentation +} // namespace presentation::internal #endif // INCLUDED_SLIDESHOW_SOURCE_INC_DELAYEVENT_HXX diff --git a/slideshow/source/inc/disposable.hxx b/slideshow/source/inc/disposable.hxx index c3be8bb4091a..a345d76e071d 100644 --- a/slideshow/source/inc/disposable.hxx +++ b/slideshow/source/inc/disposable.hxx @@ -25,9 +25,7 @@ /* Definition of Disposable interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** * Base class for being a shared pointer, since quite a few of the downstream classes @@ -60,7 +58,6 @@ namespace slideshow virtual void dispose() = 0; }; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_DISPOSABLE_HXX diff --git a/slideshow/source/inc/doctreenode.hxx b/slideshow/source/inc/doctreenode.hxx index 1bb4beda5ec9..45bbf77b0cfa 100644 --- a/slideshow/source/inc/doctreenode.hxx +++ b/slideshow/source/inc/doctreenode.hxx @@ -26,9 +26,7 @@ /* Definition of DocTreeNode class */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** This class represents kind of a DOM tree node for shape @@ -105,7 +103,7 @@ namespace slideshow }; typedef ::std::vector< DocTreeNode > VectorOfDocTreeNodes; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_DOCTREENODE_HXX diff --git a/slideshow/source/inc/doctreenodesupplier.hxx b/slideshow/source/inc/doctreenodesupplier.hxx index cebf09db4d7d..5bf91d126139 100644 --- a/slideshow/source/inc/doctreenodesupplier.hxx +++ b/slideshow/source/inc/doctreenodesupplier.hxx @@ -25,9 +25,7 @@ /* Definition of DocTreeNodeSupplier interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface to retrieve DocTreeNodes from subsettable shapes. @@ -140,7 +138,6 @@ namespace slideshow ~DocTreeNodeSupplier() {} }; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_DOCTREENODESUPPLIER_HXX diff --git a/slideshow/source/inc/enumanimation.hxx b/slideshow/source/inc/enumanimation.hxx index bb659b270f21..39a8a0251599 100644 --- a/slideshow/source/inc/enumanimation.hxx +++ b/slideshow/source/inc/enumanimation.hxx @@ -25,9 +25,7 @@ /* Definition of EnumAnimation interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface defining an enum animation. @@ -65,7 +63,6 @@ namespace slideshow typedef ::std::shared_ptr< EnumAnimation > EnumAnimationSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_ENUMANIMATION_HXX diff --git a/slideshow/source/inc/event.hxx b/slideshow/source/inc/event.hxx index 15fd0d9d65df..c60ba20f80a9 100644 --- a/slideshow/source/inc/event.hxx +++ b/slideshow/source/inc/event.hxx @@ -24,8 +24,7 @@ #include <memory> #include <vector> -namespace slideshow { -namespace internal { +namespace slideshow::internal { /** Definition of Event interface */ @@ -73,8 +72,7 @@ private: typedef ::std::shared_ptr< Event > EventSharedPtr; typedef ::std::vector< EventSharedPtr > VectorOfEvents; -} // namespace internal -} // namespace presentation +} // namespace presentation::internal #endif // INCLUDED_SLIDESHOW_SOURCE_INC_EVENT_HXX diff --git a/slideshow/source/inc/eventhandler.hxx b/slideshow/source/inc/eventhandler.hxx index 3efc5f0b4059..d74b13ecd63f 100644 --- a/slideshow/source/inc/eventhandler.hxx +++ b/slideshow/source/inc/eventhandler.hxx @@ -25,9 +25,7 @@ /* Definition of EventHandler interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface for event handling objects. @@ -53,7 +51,6 @@ namespace slideshow typedef ::std::shared_ptr< EventHandler > EventHandlerSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_EVENTHANDLER_HXX diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx index 9d84a97c9323..e0dd6fd31eb5 100644 --- a/slideshow/source/inc/eventmultiplexer.hxx +++ b/slideshow/source/inc/eventmultiplexer.hxx @@ -33,8 +33,7 @@ namespace com::sun::star::drawing { class XShape; } -namespace slideshow { -namespace internal { +namespace slideshow::internal { class EventQueue; class UnoViewContainer; @@ -653,8 +652,7 @@ private: std::unique_ptr<EventMultiplexerImpl> mpImpl; }; -} // namespace internal -} // namespace Presentation +} // namespace Presentation::internal #endif // INCLUDED_SLIDESHOW_SOURCE_INC_EVENTMULTIPLEXER_HXX diff --git a/slideshow/source/inc/eventqueue.hxx b/slideshow/source/inc/eventqueue.hxx index 76c7eecbda3c..63c93f7a302d 100644 --- a/slideshow/source/inc/eventqueue.hxx +++ b/slideshow/source/inc/eventqueue.hxx @@ -31,9 +31,7 @@ /* Definition of ActivitiesQueue class */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** This class handles events in a presentation. Events are time instants where e.g. effects start. @@ -144,7 +142,6 @@ namespace slideshow std::shared_ptr< ::canvas::tools::ElapsedTime > mpTimer; }; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_EVENTQUEUE_HXX diff --git a/slideshow/source/inc/expressionnode.hxx b/slideshow/source/inc/expressionnode.hxx index fef80fc7cc9c..6f9139012e12 100644 --- a/slideshow/source/inc/expressionnode.hxx +++ b/slideshow/source/inc/expressionnode.hxx @@ -22,9 +22,7 @@ /* Definition of ExpressionNode interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface describing an abstract animation function. @@ -72,7 +70,7 @@ namespace slideshow */ virtual bool isConstant() const = 0; }; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_EXPRESSIONNODE_HXX diff --git a/slideshow/source/inc/expressionnodefactory.hxx b/slideshow/source/inc/expressionnodefactory.hxx index 56244e843540..97d04737171e 100644 --- a/slideshow/source/inc/expressionnodefactory.hxx +++ b/slideshow/source/inc/expressionnodefactory.hxx @@ -27,9 +27,7 @@ /* Definition of ExpressionNodeFactory class */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** ExpressionNode factory @@ -64,7 +62,7 @@ namespace slideshow static std::shared_ptr<ExpressionNode> createMaxExpression ( const std::shared_ptr<ExpressionNode>& rOuterFunction, const std::shared_ptr<ExpressionNode>& rInnerFunction ); }; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_EXPRESSIONNODEFACTORY_HXX diff --git a/slideshow/source/inc/hslcolor.hxx b/slideshow/source/inc/hslcolor.hxx index 74b38995af22..b4fbb610915b 100644 --- a/slideshow/source/inc/hslcolor.hxx +++ b/slideshow/source/inc/hslcolor.hxx @@ -23,9 +23,7 @@ /* Definition of HSLColor class */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { class RGBColor; @@ -89,7 +87,7 @@ namespace slideshow When true, hue interpolation happens counter-clockwise */ HSLColor interpolate( const HSLColor& rFrom, const HSLColor& rTo, double t, bool bCCW ); - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_HSLCOLOR_HXX diff --git a/slideshow/source/inc/hslcoloranimation.hxx b/slideshow/source/inc/hslcoloranimation.hxx index e20cbc8024f5..3d2bb34c91e3 100644 --- a/slideshow/source/inc/hslcoloranimation.hxx +++ b/slideshow/source/inc/hslcoloranimation.hxx @@ -26,9 +26,7 @@ /* Definition of HSLColorAnimation interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface defining a HSL color animation. @@ -63,7 +61,6 @@ namespace slideshow typedef ::std::shared_ptr< HSLColorAnimation > HSLColorAnimationSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_HSLCOLORANIMATION_HXX diff --git a/slideshow/source/inc/hyperlinkarea.hxx b/slideshow/source/inc/hyperlinkarea.hxx index 631c3f26fc4e..d7d760c081f7 100644 --- a/slideshow/source/inc/hyperlinkarea.hxx +++ b/slideshow/source/inc/hyperlinkarea.hxx @@ -32,9 +32,7 @@ namespace basegfx { /* Definition of HyperlinkArea interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** HyperlinkArea interface @@ -92,7 +90,7 @@ namespace slideshow }; typedef std::shared_ptr< HyperlinkArea > HyperlinkAreaSharedPtr; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_HYPERLINKAREA_HXX diff --git a/slideshow/source/inc/iexternalmediashapebase.hxx b/slideshow/source/inc/iexternalmediashapebase.hxx index 3a174e977c82..156b0b2dd7ce 100644 --- a/slideshow/source/inc/iexternalmediashapebase.hxx +++ b/slideshow/source/inc/iexternalmediashapebase.hxx @@ -25,9 +25,7 @@ #include "shape.hxx" -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Represents a shape containing playable content rendered by external engine (e.g. media or applet). @@ -78,7 +76,6 @@ namespace slideshow typedef ::std::shared_ptr< IExternalMediaShapeBase > IExternalMediaShapeBaseSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_IEXTERNALMEDIASHAPEBASE_HXX diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx index 388c1db648e1..a877e206f46b 100644 --- a/slideshow/source/inc/interruptabledelayevent.hxx +++ b/slideshow/source/inc/interruptabledelayevent.hxx @@ -22,9 +22,7 @@ #include "delayevent.hxx" -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Event, which delays calling passed Event's fire() method the given amount of time. @@ -134,7 +132,7 @@ namespace slideshow return aRes; } - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_INTERRUPTABLEDELAYEVENT_HXX diff --git a/slideshow/source/inc/intrinsicanimationeventhandler.hxx b/slideshow/source/inc/intrinsicanimationeventhandler.hxx index 6016bb22745c..97ad6571caca 100644 --- a/slideshow/source/inc/intrinsicanimationeventhandler.hxx +++ b/slideshow/source/inc/intrinsicanimationeventhandler.hxx @@ -24,9 +24,7 @@ /* Definition of IntrinsicAnimationEventHandler interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface for handling intrinsic animation display modes. @@ -46,7 +44,6 @@ namespace slideshow typedef ::std::shared_ptr< IntrinsicAnimationEventHandler > IntrinsicAnimationEventHandlerSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_INTRINSICANIMATIONEVENTHANDLER_HXX diff --git a/slideshow/source/inc/listenercontainer.hxx b/slideshow/source/inc/listenercontainer.hxx index 3cdcb10b42cf..6046f5f8efe4 100644 --- a/slideshow/source/inc/listenercontainer.hxx +++ b/slideshow/source/inc/listenercontainer.hxx @@ -24,8 +24,7 @@ #include <vector> #include <iterator> -namespace slideshow { -namespace internal { +namespace slideshow::internal { struct EmptyBase { @@ -412,8 +411,7 @@ class ThreadUnsafeListenerContainer : public ListenerContainerBase<ListenerT, { }; -} // namespace internal -} // namespace slideshow +} // namespace slideshow::internal #endif // INCLUDED_SLIDESHOW_SOURCE_INC_LISTENERCONTAINER_HXX diff --git a/slideshow/source/inc/mediafilemanager.hxx b/slideshow/source/inc/mediafilemanager.hxx index 6588defa8e68..a0ec69556c4e 100644 --- a/slideshow/source/inc/mediafilemanager.hxx +++ b/slideshow/source/inc/mediafilemanager.hxx @@ -20,9 +20,7 @@ namespace avmedia struct MediaTempFile; } -namespace slideshow -{ -namespace internal +namespace slideshow::internal { class MediaFileManager { @@ -31,7 +29,6 @@ public: virtual std::shared_ptr<avmedia::MediaTempFile> getMediaTempFile(const OUString& aUrl) = 0; }; } -} #endif // INCLUDED_SLIDESHOW_SOURCE_INC_MEDIAFILEMANAGER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/inc/mouseeventhandler.hxx b/slideshow/source/inc/mouseeventhandler.hxx index 926a1acda820..6be068e8a92a 100644 --- a/slideshow/source/inc/mouseeventhandler.hxx +++ b/slideshow/source/inc/mouseeventhandler.hxx @@ -29,9 +29,7 @@ namespace com::sun::star::awt { struct MouseEvent; } /* Definition of MouseEventHandler interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface for handling mouse events. @@ -108,7 +106,6 @@ namespace slideshow typedef ::std::shared_ptr< MouseEventHandler > MouseEventHandlerSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_MOUSEEVENTHANDLER_HXX diff --git a/slideshow/source/inc/numberanimation.hxx b/slideshow/source/inc/numberanimation.hxx index ab9e9a3939dd..e35769e97327 100644 --- a/slideshow/source/inc/numberanimation.hxx +++ b/slideshow/source/inc/numberanimation.hxx @@ -25,9 +25,7 @@ /* Definition of NumberAnimation interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface defining a number animation. @@ -65,7 +63,6 @@ namespace slideshow typedef ::std::shared_ptr< NumberAnimation > NumberAnimationSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_NUMBERANIMATION_HXX diff --git a/slideshow/source/inc/pairanimation.hxx b/slideshow/source/inc/pairanimation.hxx index f8609a1469b3..45b90ebbb979 100644 --- a/slideshow/source/inc/pairanimation.hxx +++ b/slideshow/source/inc/pairanimation.hxx @@ -26,9 +26,7 @@ /* Definition of PairAnimation interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface defining a pair of numbers animation. @@ -64,7 +62,6 @@ namespace slideshow typedef ::std::shared_ptr< PairAnimation > PairAnimationSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_PAIRANIMATION_HXX diff --git a/slideshow/source/inc/pauseeventhandler.hxx b/slideshow/source/inc/pauseeventhandler.hxx index 6ac8971ae834..3d61d6ee16ec 100644 --- a/slideshow/source/inc/pauseeventhandler.hxx +++ b/slideshow/source/inc/pauseeventhandler.hxx @@ -25,9 +25,7 @@ /* Definition of PauseHandler interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface for handling pause events. @@ -57,7 +55,7 @@ namespace slideshow }; typedef ::std::shared_ptr< PauseEventHandler > PauseEventHandlerSharedPtr; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_PAUSEEVENTHANDLER_HXX diff --git a/slideshow/source/inc/rgbcolor.hxx b/slideshow/source/inc/rgbcolor.hxx index 9e12ec902a02..b5f3f8e610fc 100644 --- a/slideshow/source/inc/rgbcolor.hxx +++ b/slideshow/source/inc/rgbcolor.hxx @@ -25,9 +25,7 @@ /* Definition of RGBColor class */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { class HSLColor; @@ -88,7 +86,6 @@ namespace slideshow As usual, t must be in the [0,1] range */ RGBColor interpolate( const RGBColor& rFrom, const RGBColor& rTo, double t ); - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_RGBCOLOR_HXX diff --git a/slideshow/source/inc/screenupdater.hxx b/slideshow/source/inc/screenupdater.hxx index dcf299b18586..4ae477519021 100644 --- a/slideshow/source/inc/screenupdater.hxx +++ b/slideshow/source/inc/screenupdater.hxx @@ -26,9 +26,7 @@ /* Definition of ScreenUpdater class */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Screen updater @@ -128,7 +126,7 @@ namespace slideshow std::unique_ptr<ImplScreenUpdater> mpImpl; }; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_SCREENUPDATER_HXX diff --git a/slideshow/source/inc/shape.hxx b/slideshow/source/inc/shape.hxx index 3fcc516dda4b..6f0ee040d965 100644 --- a/slideshow/source/inc/shape.hxx +++ b/slideshow/source/inc/shape.hxx @@ -34,9 +34,7 @@ namespace basegfx { class B2DRange; } -namespace slideshow -{ - namespace internal +namespace slideshow::internal { // forward declaration necessary, because methods use ShapeSharedPtr class Shape; @@ -278,7 +276,7 @@ namespace slideshow /** A set which contains all shapes in an ordered fashion. */ typedef ::std::set< ShapeSharedPtr, Shape::lessThanShape > ShapeSet; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_SHAPE_HXX diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx index 0614ff285e7f..ac4aad87ef49 100644 --- a/slideshow/source/inc/shapeattributelayer.hxx +++ b/slideshow/source/inc/shapeattributelayer.hxx @@ -33,9 +33,7 @@ #include <memory> -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** This interface represents a stateful object. @@ -538,7 +536,6 @@ namespace slideshow bool mbVisibilityValid : 1; }; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_SHAPEATTRIBUTELAYER_HXX diff --git a/slideshow/source/inc/shapeattributelayerholder.hxx b/slideshow/source/inc/shapeattributelayerholder.hxx index ba596adcdf43..4c123b4e514f 100644 --- a/slideshow/source/inc/shapeattributelayerholder.hxx +++ b/slideshow/source/inc/shapeattributelayerholder.hxx @@ -23,9 +23,7 @@ #include "attributableshape.hxx" #include "shapeattributelayer.hxx" -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Holds a ShapeAttributeLayer, together with the associated Shape @@ -97,7 +95,6 @@ namespace slideshow ShapeAttributeLayerSharedPtr mpAttributeLayer; }; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_SHAPEATTRIBUTELAYERHOLDER_HXX diff --git a/slideshow/source/inc/shapeimporter.hxx b/slideshow/source/inc/shapeimporter.hxx index a12fa9618271..a0ccb1fd44af 100644 --- a/slideshow/source/inc/shapeimporter.hxx +++ b/slideshow/source/inc/shapeimporter.hxx @@ -33,8 +33,7 @@ #include <stack> -namespace slideshow { -namespace internal { +namespace slideshow::internal { struct SlideShowContext; @@ -135,8 +134,7 @@ private: bool mbConvertingMasterPage; }; -} // namespace internal -} // namespace presentation +} // namespace presentation::internal #endif diff --git a/slideshow/source/inc/shapelistenereventhandler.hxx b/slideshow/source/inc/shapelistenereventhandler.hxx index 386671132e93..f8776e7c9e03 100644 --- a/slideshow/source/inc/shapelistenereventhandler.hxx +++ b/slideshow/source/inc/shapelistenereventhandler.hxx @@ -34,9 +34,7 @@ namespace com::sun::star { /* Definition of ShapeListenerEventHandler interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface for handling view events. @@ -57,7 +55,6 @@ namespace slideshow typedef ::std::shared_ptr< ShapeListenerEventHandler > ShapeListenerEventHandlerSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_SHAPELISTENEREVENTHANDLER_HXX diff --git a/slideshow/source/inc/shapemanager.hxx b/slideshow/source/inc/shapemanager.hxx index db7febb110b7..28c89087d6a0 100644 --- a/slideshow/source/inc/shapemanager.hxx +++ b/slideshow/source/inc/shapemanager.hxx @@ -30,9 +30,7 @@ namespace com::sun::star::drawing { class XShape; } /* Definition of ShapeManager interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { class HyperlinkArea; class AnimatableShape; @@ -117,7 +115,7 @@ namespace slideshow }; typedef ::std::shared_ptr< ShapeManager > ShapeManagerSharedPtr; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_SHAPEMANAGER_HXX diff --git a/slideshow/source/inc/shapemaps.hxx b/slideshow/source/inc/shapemaps.hxx index 43476e05b81c..aefd8c5df423 100644 --- a/slideshow/source/inc/shapemaps.hxx +++ b/slideshow/source/inc/shapemaps.hxx @@ -30,9 +30,7 @@ namespace com::sun::star::drawing { class XShape; } /* Definition of two shape maps */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /// Maps XShape to shape listener typedef ::std::map< css::uno::Reference< css::drawing::XShape>, @@ -42,7 +40,7 @@ namespace slideshow /// Maps XShape to mouse cursor typedef ::std::map< css::uno::Reference< css::drawing::XShape>, sal_Int16> ShapeCursorMap; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_SHAPEMAPS_HXX diff --git a/slideshow/source/inc/shapesubset.hxx b/slideshow/source/inc/shapesubset.hxx index 750fc0f353b2..ad420ef5538d 100644 --- a/slideshow/source/inc/shapesubset.hxx +++ b/slideshow/source/inc/shapesubset.hxx @@ -25,9 +25,7 @@ #include <memory> -namespace slideshow -{ - namespace internal +namespace slideshow::internal { class ShapeSubset; typedef ::std::shared_ptr< ShapeSubset > ShapeSubsetSharedPtr; @@ -139,7 +137,7 @@ namespace slideshow DocTreeNode maTreeNode; SubsettableShapeManagerSharedPtr mpShapeManager; }; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_SHAPESUBSET_HXX diff --git a/slideshow/source/inc/slide.hxx b/slideshow/source/inc/slide.hxx index 8350751fa83f..db1c0d6f0917 100644 --- a/slideshow/source/inc/slide.hxx +++ b/slideshow/source/inc/slide.hxx @@ -46,9 +46,7 @@ namespace basegfx /* Definition of Slide interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { class RGBColor; class ScreenUpdater; @@ -205,7 +203,6 @@ namespace slideshow bool bUserPaintEnabled, bool bIntrinsicAnimationsAllowed, bool bDisableAnimationZOrder ); - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_SLIDE_HXX diff --git a/slideshow/source/inc/slidebitmap.hxx b/slideshow/source/inc/slidebitmap.hxx index f5248a8061e3..ef3b41f2e88b 100644 --- a/slideshow/source/inc/slidebitmap.hxx +++ b/slideshow/source/inc/slidebitmap.hxx @@ -34,9 +34,7 @@ namespace com::sun::star::rendering { class XBitmap; } /* Definition of SlideBitmap class */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Little wrapper encapsulating an XBitmap @@ -76,7 +74,7 @@ namespace slideshow }; typedef ::std::shared_ptr< SlideBitmap > SlideBitmapSharedPtr; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_SLIDEBITMAP_HXX diff --git a/slideshow/source/inc/slideshowcontext.hxx b/slideshow/source/inc/slideshowcontext.hxx index 6d14fb34b1b2..558ee6f037c0 100644 --- a/slideshow/source/inc/slideshowcontext.hxx +++ b/slideshow/source/inc/slideshowcontext.hxx @@ -26,9 +26,7 @@ namespace com::sun::star::uno { class XComponentContext; } -namespace slideshow -{ - namespace internal +namespace slideshow::internal { class ShapeManager; class EventQueue; @@ -106,7 +104,7 @@ namespace slideshow const UnoViewContainer& mrViewContainer; css::uno::Reference< css::uno::XComponentContext> mxComponentContext; }; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_SLIDESHOWCONTEXT_HXX diff --git a/slideshow/source/inc/slideview.hxx b/slideshow/source/inc/slideview.hxx index 6296faebefd9..bf95dc25118a 100644 --- a/slideshow/source/inc/slideview.hxx +++ b/slideshow/source/inc/slideview.hxx @@ -23,9 +23,7 @@ #include "unoview.hxx" /* Definition of SlideView factory method */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { class EventQueue; class EventMultiplexer; @@ -46,7 +44,6 @@ namespace slideshow css::uno::Reference< css::presentation::XSlideShowView> const& xView, EventQueue& rEventQueue, EventMultiplexer& rEventMultiplexer ); - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_SLIDEVIEW_HXX diff --git a/slideshow/source/inc/smilfunctionparser.hxx b/slideshow/source/inc/smilfunctionparser.hxx index 4842e39a9b7b..556ae9334e54 100644 --- a/slideshow/source/inc/smilfunctionparser.hxx +++ b/slideshow/source/inc/smilfunctionparser.hxx @@ -29,9 +29,7 @@ /* Definition of SmilFunctionParser class */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { class SmilFunctionParser { @@ -148,7 +146,7 @@ namespace slideshow const ::basegfx::B2DRectangle& rRelativeShapeBounds ); // throw ParseError }; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_SMILFUNCTIONPARSER_HXX diff --git a/slideshow/source/inc/soundplayer.hxx b/slideshow/source/inc/soundplayer.hxx index e571a694a2af..3914a08a2725 100644 --- a/slideshow/source/inc/soundplayer.hxx +++ b/slideshow/source/inc/soundplayer.hxx @@ -35,9 +35,7 @@ /* Definition of SoundPlayer class */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { class MediaFileManager; @@ -109,7 +107,7 @@ namespace slideshow }; typedef ::std::shared_ptr< SoundPlayer > SoundPlayerSharedPtr; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_SOUNDPLAYER_HXX diff --git a/slideshow/source/inc/stringanimation.hxx b/slideshow/source/inc/stringanimation.hxx index 2cb26c0a94b5..09a8f859e96d 100644 --- a/slideshow/source/inc/stringanimation.hxx +++ b/slideshow/source/inc/stringanimation.hxx @@ -26,9 +26,7 @@ /* Definition of StringAnimation interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface defining a string animation. @@ -63,7 +61,6 @@ namespace slideshow typedef ::std::shared_ptr< StringAnimation > StringAnimationSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_STRINGANIMATION_HXX diff --git a/slideshow/source/inc/subsettableshapemanager.hxx b/slideshow/source/inc/subsettableshapemanager.hxx index f66639b6a1a6..9279bf017af3 100644 --- a/slideshow/source/inc/subsettableshapemanager.hxx +++ b/slideshow/source/inc/subsettableshapemanager.hxx @@ -26,9 +26,7 @@ /* Definition of SubsettableShapeManager interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { class DocTreeNode; class AttributableShape; @@ -105,7 +103,7 @@ namespace slideshow }; typedef ::std::shared_ptr< SubsettableShapeManager > SubsettableShapeManagerSharedPtr; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_SUBSETTABLESHAPEMANAGER_HXX diff --git a/slideshow/source/inc/transitionfactory.hxx b/slideshow/source/inc/transitionfactory.hxx index f863bca3b46b..ea645cbec051 100644 --- a/slideshow/source/inc/transitionfactory.hxx +++ b/slideshow/source/inc/transitionfactory.hxx @@ -32,9 +32,7 @@ #include "soundplayer.hxx" #include "shapemanager.hxx" -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /* Definition of Transitionfactory class */ namespace TransitionFactory @@ -109,7 +107,7 @@ namespace slideshow const RGBColor& rTransitionFadeColor, const SoundPlayerSharedPtr& rSoundPlayer ); } - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_TRANSITIONFACTORY_HXX diff --git a/slideshow/source/inc/transitioninfo.hxx b/slideshow/source/inc/transitioninfo.hxx index 241771bec5f9..c0cd0aed143f 100644 --- a/slideshow/source/inc/transitioninfo.hxx +++ b/slideshow/source/inc/transitioninfo.hxx @@ -23,8 +23,7 @@ #include <sal/types.h> -namespace slideshow { -namespace internal { +namespace slideshow::internal { struct TransitionInfo { @@ -136,8 +135,7 @@ struct TransitionInfo }; }; -} // namespace internal -} // namespace presentation +} // namespace presentation::internal #endif // INCLUDED_SLIDESHOW_SOURCE_INC_TRANSITIONINFO_HXX diff --git a/slideshow/source/inc/unoview.hxx b/slideshow/source/inc/unoview.hxx index e1ec82549354..7adec4c15442 100644 --- a/slideshow/source/inc/unoview.hxx +++ b/slideshow/source/inc/unoview.hxx @@ -30,9 +30,7 @@ namespace com::sun::star::presentation { class XSlideShowView; } /* Definition of UnoView interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Extend View with UNO interface retrieval. @@ -68,7 +66,7 @@ namespace slideshow typedef std::shared_ptr< UnoView > UnoViewSharedPtr; typedef std::vector< UnoViewSharedPtr > UnoViewVector; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_UNOVIEW_HXX diff --git a/slideshow/source/inc/unoviewcontainer.hxx b/slideshow/source/inc/unoviewcontainer.hxx index 90c081904cd8..54ee9d579143 100644 --- a/slideshow/source/inc/unoviewcontainer.hxx +++ b/slideshow/source/inc/unoviewcontainer.hxx @@ -29,9 +29,7 @@ namespace com::sun::star::presentation { class XSlideShowView; } /* Definition of UnoViewContainer class */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Contains UnoViews */ @@ -76,7 +74,6 @@ namespace slideshow UnoViewVector maViews; }; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_UNOVIEWCONTAINER_HXX diff --git a/slideshow/source/inc/usereventqueue.hxx b/slideshow/source/inc/usereventqueue.hxx index 13b4d3adf385..785a8bdf3764 100644 --- a/slideshow/source/inc/usereventqueue.hxx +++ b/slideshow/source/inc/usereventqueue.hxx @@ -28,8 +28,7 @@ /* Definition of UserEventQueue class */ -namespace slideshow { -namespace internal { +namespace slideshow::internal { class AllAnimationEventHandler; class ShapeClickEventHandler; @@ -263,8 +262,7 @@ private: bool mbAdvanceOnClick; }; -} // namespace internal -} // namespace presentation +} // namespace presentation::internal #endif // INCLUDED_SLIDESHOW_SOURCE_INC_USEREVENTQUEUE_HXX diff --git a/slideshow/source/inc/view.hxx b/slideshow/source/inc/view.hxx index 4298fa1b273e..0d1937b60e85 100644 --- a/slideshow/source/inc/view.hxx +++ b/slideshow/source/inc/view.hxx @@ -31,9 +31,7 @@ namespace basegfx { class B2DRange; class B2DVector; } /* Definition of View interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { class View : public ViewLayer { @@ -81,7 +79,7 @@ namespace slideshow typedef std::shared_ptr< View > ViewSharedPtr; typedef std::vector< ViewSharedPtr > ViewVector; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_VIEW_HXX diff --git a/slideshow/source/inc/vieweventhandler.hxx b/slideshow/source/inc/vieweventhandler.hxx index aa75acaf9f21..a375e047f560 100644 --- a/slideshow/source/inc/vieweventhandler.hxx +++ b/slideshow/source/inc/vieweventhandler.hxx @@ -28,9 +28,7 @@ /* Definition of ViewEventHandler interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface for handling view events. @@ -82,7 +80,6 @@ namespace slideshow typedef ::std::weak_ptr< ViewEventHandler > ViewEventHandlerWeakPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_VIEWEVENTHANDLER_HXX diff --git a/slideshow/source/inc/viewlayer.hxx b/slideshow/source/inc/viewlayer.hxx index a3a331a1666e..4fe8aa4e03d3 100644 --- a/slideshow/source/inc/viewlayer.hxx +++ b/slideshow/source/inc/viewlayer.hxx @@ -44,9 +44,7 @@ namespace cppcanvas /* Definition of ViewLayer interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { class View; typedef std::shared_ptr< View > ViewSharedPtr; @@ -168,7 +166,6 @@ namespace slideshow }; typedef std::shared_ptr< ViewLayer > ViewLayerSharedPtr; - } } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_VIEWLAYER_HXX diff --git a/slideshow/source/inc/viewupdate.hxx b/slideshow/source/inc/viewupdate.hxx index f083347ce415..a5e2ee3402b0 100644 --- a/slideshow/source/inc/viewupdate.hxx +++ b/slideshow/source/inc/viewupdate.hxx @@ -25,9 +25,7 @@ /* Definition of ViewUpdate interface */ -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interface for something that can perform view updates. @@ -54,7 +52,7 @@ namespace slideshow }; typedef ::std::shared_ptr< ViewUpdate > ViewUpdateSharedPtr; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_INC_VIEWUPDATE_HXX diff --git a/slideshow/source/inc/wakeupevent.hxx b/slideshow/source/inc/wakeupevent.hxx index 6992be9e761d..8a1379f02744 100644 --- a/slideshow/source/inc/wakeupevent.hxx +++ b/slideshow/source/inc/wakeupevent.hxx @@ -24,8 +24,7 @@ #include "event.hxx" #include "activitiesqueue.hxx" -namespace slideshow { -namespace internal { +namespace slideshow::internal { /** Little helper class, used to set Activities active again after some sleep period. @@ -77,8 +76,7 @@ private: typedef ::std::shared_ptr< WakeupEvent > WakeupEventSharedPtr; -} // namespace internal -} // namespace presentation +} // namespace presentation::internal #endif // INCLUDED_SLIDESHOW_SOURCE_INC_WAKEUPEVENT_HXX |