summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-11-12 12:44:32 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-11-12 13:59:50 +0100
commit1a2926a995fdbdcdae0ca6407877084f3520e539 (patch)
tree4ac33d3d0f1d3941c6fe782633fe6e555c157c13 /slideshow
parenta07c637a0e4fe0ab81db70c69decbc946ad37da9 (diff)
use std::move when popping stuff off stacks
Change-Id: I6ba0ee8afee1a9579045643cd0118cf19599d5b9 Reviewed-on: https://gerrit.libreoffice.org/82497 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/eventqueue.cxx4
-rw-r--r--slideshow/source/engine/smilfunctionparser.cxx6
2 files changed, 5 insertions, 5 deletions
diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx
index d5596cdb7036..e2b909e40185 100644
--- a/slideshow/source/engine/eventqueue.cxx
+++ b/slideshow/source/engine/eventqueue.cxx
@@ -180,7 +180,7 @@ namespace slideshow
&& !bFireAllEvents
&& (maEvents.empty() || maEvents.top().nTime > nCurrTime))
{
- const EventEntry aEvent (maNextNextEvents.top());
+ const EventEntry aEvent (std::move(maNextNextEvents.top()));
maNextNextEvents.pop();
maEvents.push(aEvent);
}
@@ -192,7 +192,7 @@ namespace slideshow
while( !maEvents.empty() &&
(bFireAllEvents || maEvents.top().nTime <= nCurrTime) )
{
- EventEntry event( maEvents.top() );
+ EventEntry event( std::move(maEvents.top()) );
maEvents.pop();
// only process event, if it is still 'charged',
diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx
index 678e3c5ed740..9a6673e7db2a 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -238,7 +238,7 @@ namespace slideshow
throw ParseError( "Not enough arguments for unary operator" );
// retrieve arguments
- std::shared_ptr<ExpressionNode> pArg( rNodeStack.top() );
+ std::shared_ptr<ExpressionNode> pArg( std::move(rNodeStack.top()) );
rNodeStack.pop();
// check for constness
@@ -313,9 +313,9 @@ namespace slideshow
throw ParseError( "Not enough arguments for binary operator" );
// retrieve arguments
- std::shared_ptr<ExpressionNode> pSecondArg( rNodeStack.top() );
+ std::shared_ptr<ExpressionNode> pSecondArg( std::move(rNodeStack.top()) );
rNodeStack.pop();
- std::shared_ptr<ExpressionNode> pFirstArg( rNodeStack.top() );
+ std::shared_ptr<ExpressionNode> pFirstArg( std::move(rNodeStack.top()) );
rNodeStack.pop();
// create combined ExpressionNode