diff options
| author | Mark Page <aptitude@btconnect.com> | 2016-06-07 11:59:24 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-08 11:09:44 +0000 |
| commit | 22fa9289fdc6fd8d82d754adfef39fee3fd3c52f (patch) | |
| tree | 9adcbeb8394912bd45f6c346d2dac3144c621593 /slideshow/source/inc | |
| parent | f595e70cfee85a423f592190c607231cb00e3180 (diff) | |
tdf#96099 Remove various smart pointer typedefs
Change-Id: I76843139e43ca1c158a977e24d210d5af93e4d0f
Reviewed-on: https://gerrit.libreoffice.org/26014
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'slideshow/source/inc')
| -rw-r--r-- | slideshow/source/inc/expressionnode.hxx | 2 | ||||
| -rw-r--r-- | slideshow/source/inc/expressionnodefactory.hxx | 28 | ||||
| -rw-r--r-- | slideshow/source/inc/smilfunctionparser.hxx | 4 |
3 files changed, 16 insertions, 18 deletions
diff --git a/slideshow/source/inc/expressionnode.hxx b/slideshow/source/inc/expressionnode.hxx index 8bd0b14e2e85..bb6aff2cba7d 100644 --- a/slideshow/source/inc/expressionnode.hxx +++ b/slideshow/source/inc/expressionnode.hxx @@ -76,8 +76,6 @@ namespace slideshow */ virtual bool isConstant() const = 0; }; - - typedef ::std::shared_ptr< ExpressionNode > ExpressionNodeSharedPtr; } } diff --git a/slideshow/source/inc/expressionnodefactory.hxx b/slideshow/source/inc/expressionnodefactory.hxx index 5c3d994034a6..d4a60b3c72c9 100644 --- a/slideshow/source/inc/expressionnodefactory.hxx +++ b/slideshow/source/inc/expressionnodefactory.hxx @@ -41,29 +41,29 @@ namespace slideshow class ExpressionNodeFactory { public: - static ExpressionNodeSharedPtr createConstantValueExpression( double rConstantValue ); + static std::shared_ptr<ExpressionNode> createConstantValueExpression( double rConstantValue ); - static ExpressionNodeSharedPtr createValueTExpression (); + static std::shared_ptr<ExpressionNode> createValueTExpression (); - static ExpressionNodeSharedPtr createPlusExpression ( const ExpressionNodeSharedPtr& rLHS, - const ExpressionNodeSharedPtr& rRHS ); - static ExpressionNodeSharedPtr createMinusExpression ( const ExpressionNodeSharedPtr& rLHS, - const ExpressionNodeSharedPtr& rRHS ); - static ExpressionNodeSharedPtr createMultipliesExpression( const ExpressionNodeSharedPtr& rLHS, - const ExpressionNodeSharedPtr& rRHS ); - static ExpressionNodeSharedPtr createDividesExpression ( const ExpressionNodeSharedPtr& rLHS, - const ExpressionNodeSharedPtr& rRHS ); + static std::shared_ptr<ExpressionNode> createPlusExpression ( const std::shared_ptr<ExpressionNode>& rLHS, + const std::shared_ptr<ExpressionNode>& rRHS ); + static std::shared_ptr<ExpressionNode> createMinusExpression ( const std::shared_ptr<ExpressionNode>& rLHS, + const std::shared_ptr<ExpressionNode>& rRHS ); + static std::shared_ptr<ExpressionNode> createMultipliesExpression( const std::shared_ptr<ExpressionNode>& rLHS, + const std::shared_ptr<ExpressionNode>& rRHS ); + static std::shared_ptr<ExpressionNode> createDividesExpression ( const std::shared_ptr<ExpressionNode>& rLHS, + const std::shared_ptr<ExpressionNode>& rRHS ); /** Composes two ExpressionNode function. The resulting expression will calculate rOuterFunction( rInnerFunction(t) ). */ - static ExpressionNodeSharedPtr createMinExpression ( const ExpressionNodeSharedPtr& rOuterFunction, - const ExpressionNodeSharedPtr& rInnerFunction ); + static std::shared_ptr<ExpressionNode> createMinExpression ( const std::shared_ptr<ExpressionNode>& rOuterFunction, + const std::shared_ptr<ExpressionNode>& rInnerFunction ); - static ExpressionNodeSharedPtr createMaxExpression ( const ExpressionNodeSharedPtr& rOuterFunction, - const ExpressionNodeSharedPtr& rInnerFunction ); + static std::shared_ptr<ExpressionNode> createMaxExpression ( const std::shared_ptr<ExpressionNode>& rOuterFunction, + const std::shared_ptr<ExpressionNode>& rInnerFunction ); }; } } diff --git a/slideshow/source/inc/smilfunctionparser.hxx b/slideshow/source/inc/smilfunctionparser.hxx index 42a07be7941c..236dce4fdfbd 100644 --- a/slideshow/source/inc/smilfunctionparser.hxx +++ b/slideshow/source/inc/smilfunctionparser.hxx @@ -95,7 +95,7 @@ namespace slideshow @return the generated function object. */ - static ExpressionNodeSharedPtr parseSmilValue( const OUString& rSmilValue, + static std::shared_ptr<ExpressionNode> parseSmilValue( const OUString& rSmilValue, const ::basegfx::B2DRectangle& rRelativeShapeBounds ); // throw ParseError /** Parse a string containing a SMIL function. @@ -143,7 +143,7 @@ namespace slideshow @return the generated function object. */ - static ExpressionNodeSharedPtr parseSmilFunction( const OUString& rSmilFunction, + static std::shared_ptr<ExpressionNode> parseSmilFunction( const OUString& rSmilFunction, const ::basegfx::B2DRectangle& rRelativeShapeBounds ); // throw ParseError }; |