diff options
author | Philipp Hofer <philipp.hofer@protonmail.com> | 2020-11-12 13:16:29 +0100 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-11-19 19:28:27 +0100 |
commit | 156da5b55362db37d4e61a22e43e489e48797452 (patch) | |
tree | a41a09cd175634ee7d07a8ea2d67a1dd7b297101 /slideshow | |
parent | 15d080d2ca19891187a547f66d77183ebed0811b (diff) |
tdf#123936 Formatting files in module slideshow with clang-format
Change-Id: I108be5e01ed319f42912a6762ebceb97795113ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105708
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
Diffstat (limited to 'slideshow')
-rw-r--r-- | slideshow/source/engine/transitions/barndoorwipe.hxx | 17 | ||||
-rw-r--r-- | slideshow/source/engine/transitions/clockwipe.hxx | 11 | ||||
-rw-r--r-- | slideshow/source/engine/transitions/doublediamondwipe.hxx | 9 | ||||
-rw-r--r-- | slideshow/source/engine/transitions/iriswipe.cxx | 13 | ||||
-rw-r--r-- | slideshow/source/engine/transitions/iriswipe.hxx | 15 | ||||
-rw-r--r-- | slideshow/source/engine/transitions/randomwipe.hxx | 17 | ||||
-rw-r--r-- | slideshow/source/engine/transitions/transitionfactorytab.hxx | 10 | ||||
-rw-r--r-- | slideshow/source/engine/transitions/transitiontools.hxx | 12 | ||||
-rw-r--r-- | slideshow/source/engine/transitions/veewipe.hxx | 9 | ||||
-rw-r--r-- | slideshow/source/inc/animationnode.hxx | 31 | ||||
-rw-r--r-- | slideshow/source/inc/event.hxx | 15 | ||||
-rw-r--r-- | slideshow/source/inc/framerate.hxx | 4 |
12 files changed, 72 insertions, 91 deletions
diff --git a/slideshow/source/engine/transitions/barndoorwipe.hxx b/slideshow/source/engine/transitions/barndoorwipe.hxx index decc63dab0ef..775c54b6c994 100644 --- a/slideshow/source/engine/transitions/barndoorwipe.hxx +++ b/slideshow/source/engine/transitions/barndoorwipe.hxx @@ -25,22 +25,23 @@ #include "parametricpolypolygon.hxx" #include "transitiontools.hxx" - -namespace slideshow::internal { - +namespace slideshow::internal +{ /// Generate a barn door wipe or double barn door wipe: class BarnDoorWipe : public ParametricPolyPolygon { public: - explicit BarnDoorWipe( bool doubled = false ) - : m_unitRect( createUnitRect() ), m_doubled(doubled) {} - virtual ::basegfx::B2DPolyPolygon operator()( double x ) override; + explicit BarnDoorWipe(bool doubled = false) + : m_unitRect(createUnitRect()) + , m_doubled(doubled) + { + } + virtual ::basegfx::B2DPolyPolygon operator()(double x) override; + private: const ::basegfx::B2DPolygon m_unitRect; const bool m_doubled; }; - - } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_BARNDOORWIPE_HXX diff --git a/slideshow/source/engine/transitions/clockwipe.hxx b/slideshow/source/engine/transitions/clockwipe.hxx index 437f308285f3..b6745ed36c09 100644 --- a/slideshow/source/engine/transitions/clockwipe.hxx +++ b/slideshow/source/engine/transitions/clockwipe.hxx @@ -23,19 +23,16 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include "parametricpolypolygon.hxx" - -namespace slideshow::internal { - +namespace slideshow::internal +{ /// Generates a clockWiseTwelve clock wipe: class ClockWipe : public ParametricPolyPolygon { public: /// 0,1 to 1,1 to 1,0 to 0,-1 to -1,0 to 0,1: - static ::basegfx::B2DPolygon calcCenteredClock( double t, double e = 1.0 ); - virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override; + static ::basegfx::B2DPolygon calcCenteredClock(double t, double e = 1.0); + virtual ::basegfx::B2DPolyPolygon operator()(double t) override; }; - - } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_CLOCKWIPE_HXX diff --git a/slideshow/source/engine/transitions/doublediamondwipe.hxx b/slideshow/source/engine/transitions/doublediamondwipe.hxx index eca5d865c0ef..c77a783ef707 100644 --- a/slideshow/source/engine/transitions/doublediamondwipe.hxx +++ b/slideshow/source/engine/transitions/doublediamondwipe.hxx @@ -24,18 +24,15 @@ #include "parametricpolypolygon.hxx" - -namespace slideshow::internal { - +namespace slideshow::internal +{ /// Generates a double diamond wipe: class DoubleDiamondWipe : public ParametricPolyPolygon { public: DoubleDiamondWipe() {} - virtual ::basegfx::B2DPolyPolygon operator()( double x ) override; + virtual ::basegfx::B2DPolyPolygon operator()(double x) override; }; - - } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_DOUBLEDIAMONDWIPE_HXX diff --git a/slideshow/source/engine/transitions/iriswipe.cxx b/slideshow/source/engine/transitions/iriswipe.cxx index 72d3e5a61bdf..ebceddb19078 100644 --- a/slideshow/source/engine/transitions/iriswipe.cxx +++ b/slideshow/source/engine/transitions/iriswipe.cxx @@ -17,25 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include "iriswipe.hxx" - -namespace slideshow::internal { - -::basegfx::B2DPolyPolygon IrisWipe::operator () ( double t ) +namespace slideshow::internal +{ +::basegfx::B2DPolyPolygon IrisWipe::operator()(double t) { const double d = ::basegfx::pruneScaleValue(t); basegfx::B2DHomMatrix aTransform(basegfx::utils::createTranslateB2DHomMatrix(-0.5, -0.5)); aTransform = basegfx::utils::createScaleTranslateB2DHomMatrix(d, d, 0.5, 0.5) * aTransform; - ::basegfx::B2DPolyPolygon res( m_unitRect ); - res.transform( aTransform ); + ::basegfx::B2DPolyPolygon res(m_unitRect); + res.transform(aTransform); return res; } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/transitions/iriswipe.hxx b/slideshow/source/engine/transitions/iriswipe.hxx index f818568e9ad6..486adf988d1c 100644 --- a/slideshow/source/engine/transitions/iriswipe.hxx +++ b/slideshow/source/engine/transitions/iriswipe.hxx @@ -24,20 +24,21 @@ #include "parametricpolypolygon.hxx" #include "transitiontools.hxx" - -namespace slideshow::internal { - +namespace slideshow::internal +{ /// Generate an iris wipe class IrisWipe : public ParametricPolyPolygon { public: - IrisWipe() : m_unitRect( createUnitRect() ) {} - virtual ::basegfx::B2DPolyPolygon operator()( double x ) override; + IrisWipe() + : m_unitRect(createUnitRect()) + { + } + virtual ::basegfx::B2DPolyPolygon operator()(double x) override; + private: const ::basegfx::B2DPolyPolygon m_unitRect; }; - - } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_IRISWIPE_HXX diff --git a/slideshow/source/engine/transitions/randomwipe.hxx b/slideshow/source/engine/transitions/randomwipe.hxx index 3bc2364792b1..52939910ca7c 100644 --- a/slideshow/source/engine/transitions/randomwipe.hxx +++ b/slideshow/source/engine/transitions/randomwipe.hxx @@ -26,23 +26,20 @@ #include "parametricpolypolygon.hxx" - -namespace slideshow::internal { - +namespace slideshow::internal +{ class RandomWipe : public ParametricPolyPolygon { public: - RandomWipe( sal_Int32 nElements, - bool randomBars /* true: generates a horizontal random bar wipe, - false: generates a dissolve wipe */ ); - virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override; + RandomWipe(sal_Int32 nElements, bool randomBars /* true: generates a horizontal random bar wipe, + false: generates a dissolve wipe */); + virtual ::basegfx::B2DPolyPolygon operator()(double t) override; + private: - ::std::unique_ptr< ::basegfx::B2DPoint []> m_positions; + ::std::unique_ptr<::basegfx::B2DPoint[]> m_positions; sal_Int32 m_nElements; ::basegfx::B2DPolygon m_rect; }; - - } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_RANDOMWIPE_HXX diff --git a/slideshow/source/engine/transitions/transitionfactorytab.hxx b/slideshow/source/engine/transitions/transitionfactorytab.hxx index 157dfec47e44..ba7177f660d8 100644 --- a/slideshow/source/engine/transitions/transitionfactorytab.hxx +++ b/slideshow/source/engine/transitions/transitionfactorytab.hxx @@ -24,15 +24,13 @@ #include <sal/types.h> -namespace slideshow::internal { - +namespace slideshow::internal +{ struct TransitionInfo; -TransitionInfo const * getTransitionInfo( - sal_Int16 nTransitionType, sal_Int16 nTransitionSubType); - -TransitionInfo const * getRandomTransitionInfo(); +TransitionInfo const* getTransitionInfo(sal_Int16 nTransitionType, sal_Int16 nTransitionSubType); +TransitionInfo const* getRandomTransitionInfo(); } #endif diff --git a/slideshow/source/engine/transitions/transitiontools.hxx b/slideshow/source/engine/transitions/transitiontools.hxx index 4f6c4915cf1f..806677843ec5 100644 --- a/slideshow/source/engine/transitions/transitiontools.hxx +++ b/slideshow/source/engine/transitions/transitiontools.hxx @@ -23,20 +23,16 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> - -namespace slideshow::internal { - +namespace slideshow::internal +{ /// Create a unit rect. ::basegfx::B2DPolygon createUnitRect(); /// Flips on X-axis: -::basegfx::B2DPolyPolygon flipOnXAxis( - ::basegfx::B2DPolyPolygon const & polypoly ); +::basegfx::B2DPolyPolygon flipOnXAxis(::basegfx::B2DPolyPolygon const& polypoly); /// Flips on Y-axis: -::basegfx::B2DPolyPolygon flipOnYAxis( - ::basegfx::B2DPolyPolygon const & polypoly ); - +::basegfx::B2DPolyPolygon flipOnYAxis(::basegfx::B2DPolyPolygon const& polypoly); } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_TRANSITIONTOOLS_HXX diff --git a/slideshow/source/engine/transitions/veewipe.hxx b/slideshow/source/engine/transitions/veewipe.hxx index e17d86771e0a..cb0e3b281b86 100644 --- a/slideshow/source/engine/transitions/veewipe.hxx +++ b/slideshow/source/engine/transitions/veewipe.hxx @@ -24,18 +24,15 @@ #include "parametricpolypolygon.hxx" - -namespace slideshow::internal { - +namespace slideshow::internal +{ /// Generate a vee wipe class VeeWipe : public ParametricPolyPolygon { public: VeeWipe() {} - virtual ::basegfx::B2DPolyPolygon operator()( double x ) override; + virtual ::basegfx::B2DPolyPolygon operator()(double x) override; }; - - } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_VEEWIPE_HXX diff --git a/slideshow/source/inc/animationnode.hxx b/slideshow/source/inc/animationnode.hxx index ea08b552b4fc..14fd21ce9894 100644 --- a/slideshow/source/inc/animationnode.hxx +++ b/slideshow/source/inc/animationnode.hxx @@ -24,11 +24,10 @@ #include <com/sun/star/animations/XAnimationNode.hpp> #include <memory> - -namespace slideshow::internal { - +namespace slideshow::internal +{ class AnimationNode; -typedef ::std::shared_ptr< AnimationNode > AnimationNodeSharedPtr; +typedef ::std::shared_ptr<AnimationNode> AnimationNodeSharedPtr; /** This interface is used to mirror every XAnimateNode object in the presentation core. @@ -38,26 +37,26 @@ class AnimationNode : public Disposable public: /** The current state of this AnimationNode */ - enum NodeState { + enum NodeState + { /// Invalid state, node is disposed or otherwise invalid - INVALID =0, + INVALID = 0, /// Unresolved start time - UNRESOLVED =1, + UNRESOLVED = 1, /// Resolved start time, node will start eventually - RESOLVED =2, + RESOLVED = 2, /// Node is active - ACTIVE =4, + ACTIVE = 4, /// Node is frozen (no longer active, but changes remain in place) - FROZEN =8, + FROZEN = 8, /// Node has completed an active lifecycle, /// and any effect is removed from the document - ENDED =16 + ENDED = 16 }; /** Query the corresponding XAnimationNode. */ - virtual css::uno::Reference< css::animations::XAnimationNode > - getXAnimationNode() const = 0; + virtual css::uno::Reference<css::animations::XAnimationNode> getXAnimationNode() const = 0; /** Init this node @@ -125,15 +124,13 @@ public: @param rNotifee AnimationNode to notify */ - virtual bool registerDeactivatingListener( - const AnimationNodeSharedPtr& rNotifee ) = 0; + virtual bool registerDeactivatingListener(const AnimationNodeSharedPtr& rNotifee) = 0; /** Called to notify another AnimationNode's deactivation @param rNotifier The instance who calls this method. */ - virtual void notifyDeactivating( - const AnimationNodeSharedPtr& rNotifier ) = 0; + virtual void notifyDeactivating(const AnimationNodeSharedPtr& rNotifier) = 0; /** Called by the container to remove the animation effect to make the painted shape correct if it restart because diff --git a/slideshow/source/inc/event.hxx b/slideshow/source/inc/event.hxx index c60ba20f80a9..9377bc9d7f25 100644 --- a/slideshow/source/inc/event.hxx +++ b/slideshow/source/inc/event.hxx @@ -24,14 +24,17 @@ #include <memory> #include <vector> -namespace slideshow::internal { - +namespace slideshow::internal +{ /** Definition of Event interface */ class Event : public Disposable { public: - Event (const OUString& rsDescription) : msDescription(rsDescription) {} + Event(const OUString& rsDescription) + : msDescription(rsDescription) + { + } /** Execute the event. @@ -61,7 +64,7 @@ public: @return the time instant in seconds, on which this event is to be fired. */ - virtual double getActivationTime( double nCurrentTime ) const = 0; + virtual double getActivationTime(double nCurrentTime) const = 0; const OUString& GetDescription() const { return msDescription; } @@ -69,8 +72,8 @@ private: const OUString msDescription; }; -typedef ::std::shared_ptr< Event > EventSharedPtr; -typedef ::std::vector< EventSharedPtr > VectorOfEvents; +typedef ::std::shared_ptr<Event> EventSharedPtr; +typedef ::std::vector<EventSharedPtr> VectorOfEvents; } // namespace presentation::internal diff --git a/slideshow/source/inc/framerate.hxx b/slideshow/source/inc/framerate.hxx index af861dce60c8..0d7e98126fbc 100644 --- a/slideshow/source/inc/framerate.hxx +++ b/slideshow/source/inc/framerate.hxx @@ -22,8 +22,8 @@ #include <sal/types.h> -namespace slideshow::internal { - +namespace slideshow::internal +{ /** Some frame rate related data. */ class FrameRate |