summaryrefslogtreecommitdiff
path: root/include/svx/sdr/animation
diff options
context:
space:
mode:
Diffstat (limited to 'include/svx/sdr/animation')
-rw-r--r--include/svx/sdr/animation/animationstate.hxx16
-rw-r--r--include/svx/sdr/animation/objectanimator.hxx7
-rw-r--r--include/svx/sdr/animation/scheduler.hxx7
3 files changed, 8 insertions, 22 deletions
diff --git a/include/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx
index fb19740644b8..3284a68386c6 100644
--- a/include/svx/sdr/animation/animationstate.hxx
+++ b/include/svx/sdr/animation/animationstate.hxx
@@ -24,17 +24,9 @@
#include <svx/sdr/animation/scheduler.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-namespace sdr
-{
- namespace contact
- {
- class ViewObjectContact;
- } // end of namespace contact
-}
+namespace sdr::contact { class ViewObjectContact; }
-namespace sdr
-{
- namespace animation
+namespace sdr::animation
{
class PrimitiveAnimation final : public Event
{
@@ -58,8 +50,8 @@ namespace sdr
// execute event, from base class Event
virtual void Trigger(sal_uInt32 nTime) override;
};
- } // end of namespace animation
-} // end of namespace sdr
+
+} // end of namespace sdr::animation
#endif // INCLUDED_SVX_SDR_ANIMATION_ANIMATIONSTATE_HXX
diff --git a/include/svx/sdr/animation/objectanimator.hxx b/include/svx/sdr/animation/objectanimator.hxx
index fca03a85466e..a0e199932bc8 100644
--- a/include/svx/sdr/animation/objectanimator.hxx
+++ b/include/svx/sdr/animation/objectanimator.hxx
@@ -24,10 +24,8 @@
#include <svx/sdr/animation/scheduler.hxx>
-namespace sdr
+namespace sdr::animation
{
- namespace animation
- {
class primitiveAnimator final : public Scheduler
{
public:
@@ -35,8 +33,7 @@ namespace sdr
primitiveAnimator();
UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) virtual ~primitiveAnimator() override;
};
- } // end of namespace animation
-} // end of namespace sdr
+} // end of namespace sdr::animation
#endif // INCLUDED_SVX_SDR_ANIMATION_OBJECTANIMATOR_HXX
diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx
index 43666f3982f7..312083b684a2 100644
--- a/include/svx/sdr/animation/scheduler.hxx
+++ b/include/svx/sdr/animation/scheduler.hxx
@@ -26,9 +26,7 @@
#include <vector>
-namespace sdr
-{
- namespace animation
+namespace sdr::animation
{
class SVXCORE_DLLPUBLIC Event
@@ -93,8 +91,7 @@ namespace sdr
SAL_DLLPRIVATE void SetPaused(bool bNew);
};
- } // end of namespace animation
-} // end of namespace sdr
+} // end of namespace sdr::animation
#endif // INCLUDED_SVX_SDR_ANIMATION_SCHEDULER_HXX