diff options
Diffstat (limited to 'slideshow/source/engine/activities')
6 files changed, 6 insertions, 23 deletions
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx index 63b39d2d23d5..6f5a05b197cb 100644 --- a/slideshow/source/engine/activities/activitiesfactory.cxx +++ b/slideshow/source/engine/activities/activitiesfactory.cxx @@ -43,8 +43,7 @@ using namespace com::sun::star; -namespace slideshow { -namespace internal { +namespace slideshow::internal { namespace { @@ -1011,7 +1010,6 @@ AnimationActivitySharedPtr ActivitiesFactory::createSimpleActivity( return std::make_shared<SimpleActivity<0>>( aActivityParms, rAnim ); } -} // namespace internal } // namespace presentation /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/activities/activitybase.cxx b/slideshow/source/engine/activities/activitybase.cxx index e256b269611c..82a117f8a6d2 100644 --- a/slideshow/source/engine/activities/activitybase.cxx +++ b/slideshow/source/engine/activities/activitybase.cxx @@ -26,10 +26,8 @@ #include "activitybase.hxx" -namespace slideshow +namespace slideshow::internal { - namespace internal - { // TODO(P1): Elide some virtual function calls, by templifying this // static hierarchy @@ -231,7 +229,6 @@ namespace slideshow return nT; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/activities/continuousactivitybase.cxx b/slideshow/source/engine/activities/continuousactivitybase.cxx index 0928fd1bdd03..64e2377f9ab6 100644 --- a/slideshow/source/engine/activities/continuousactivitybase.cxx +++ b/slideshow/source/engine/activities/continuousactivitybase.cxx @@ -21,10 +21,8 @@ #include "continuousactivitybase.hxx" -namespace slideshow +namespace slideshow::internal { - namespace internal - { ContinuousActivityBase::ContinuousActivityBase( const ActivityParameters& rParms ) : SimpleContinuousActivityBase( rParms ) { @@ -36,7 +34,6 @@ namespace slideshow perform( calcAcceleratedTime( nSimpleTime ), nRepeatCount ); } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx index 0369c22851ca..38d3590da3b6 100644 --- a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx +++ b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx @@ -24,10 +24,8 @@ #include <tuple> -namespace slideshow +namespace slideshow::internal { - namespace internal - { ContinuousKeyTimeActivityBase::ContinuousKeyTimeActivityBase( const ActivityParameters& rParms ) : SimpleContinuousActivityBase( rParms ), maLerper( rParms.maDiscreteTimes ) @@ -56,7 +54,6 @@ namespace slideshow fAlpha, nRepeatCount ); } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/activities/discreteactivitybase.cxx b/slideshow/source/engine/activities/discreteactivitybase.cxx index 2ce8286767d9..2fe0935b698a 100644 --- a/slideshow/source/engine/activities/discreteactivitybase.cxx +++ b/slideshow/source/engine/activities/discreteactivitybase.cxx @@ -23,10 +23,8 @@ #include "discreteactivitybase.hxx" -namespace slideshow +namespace slideshow::internal { - namespace internal - { DiscreteActivityBase::DiscreteActivityBase( const ActivityParameters& rParms ) : ActivityBase( rParms ), mpWakeupEvent( rParms.mpWakeupEvent ), @@ -189,7 +187,6 @@ namespace slideshow ActivityBase::dispose(); } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx index 5566b5883f78..9e23fc2c76c8 100644 --- a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx +++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx @@ -24,10 +24,8 @@ #include <sal/log.hxx> -namespace slideshow +namespace slideshow::internal { - namespace internal - { SimpleContinuousActivityBase::SimpleContinuousActivityBase( const ActivityParameters& rParms ) : ActivityBase( rParms ), @@ -244,7 +242,6 @@ namespace slideshow return isActive(); } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |