summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-10-26 10:27:48 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-10-26 10:27:48 +0200
commit084f454e8caa2d9e43f7bdea098538bfb87423d8 (patch)
tree46c900bd78b03d20886dadad92adb17cf3045d4b /slideshow
parent7e87403953dfd54bf1e904ccc7436c6f327a9069 (diff)
More loplugin:unnecessaryparen
81892b2037453108b9bde1512a500cf3b2ce438a "loplugin:unnecessaryparen when compiling as C++17, so the ParenExpr is no longer hidden behind ExprWithCleanups/CXXConstructExpr/MaterializedTemporaryExpr wrappers" gave me the idea to generally look though IgnoreImplicit instead of IngoreImpCasts in loplugin:unnecessaryparen. However, that would still not look through implicit CXXConstructExpr, so would still not have found the occurrences in 81892b2037453108b9bde1512a500cf3b2ce438a when compiling in pre-C++17 mode. Therefore, let ignoreAllImplicit also look through CXXConstructExpr. (I am not entirely sure in which situations non-implicit CXXConstructExpr---that should thus not be ignored---would occur, but assume they would be underneath something like a CXXFunctionalCastExpr, which is not ignored.) Change-Id: I947d08742e1809150ecc34a7abe84cca5e0ce843
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/animationnodes/animationbasenode.cxx4
-rw-r--r--slideshow/source/engine/animationnodes/basenode.cxx2
-rw-r--r--slideshow/source/engine/effectrewinder.cxx2
-rw-r--r--slideshow/source/engine/slide/targetpropertiescreator.cxx2
4 files changed, 5 insertions, 5 deletions
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx
index 36d88d05a2b6..678c4a51a9ff 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.cxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx
@@ -389,11 +389,11 @@ AnimationBaseNode::fillCommonParameters() const
boost::optional<double> aRepeats;
double nRepeats = 0;
- if( (mxAnimateNode->getRepeatCount() >>= nRepeats) ) {
+ if( mxAnimateNode->getRepeatCount() >>= nRepeats ) {
aRepeats.reset( nRepeats );
}
else {
- if( (mxAnimateNode->getRepeatDuration() >>= nRepeats) ) {
+ if( mxAnimateNode->getRepeatDuration() >>= nRepeats ) {
// when repeatDuration is given,
// autoreverse does _not_ modify the
// active duration. Thus, calc repeat
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx
index a83daa1889dc..16dec389d38d 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -702,7 +702,7 @@ void BaseNode::showState() const
css::presentation::ParagraphTarget aTarget;
// no shape provided. Maybe a ParagraphTarget?
- if( (xAnimate->getTarget() >>= aTarget) )
+ if( xAnimate->getTarget() >>= aTarget )
xTargetShape = aTarget.Shape;
}
diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx
index b14df76a23c8..d920bdd4ad06 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -312,7 +312,7 @@ bool EffectRewinder::notifyAnimationStart (const AnimationNodeSharedPtr& rpNode)
if (xNode.is())
{
animations::Event aEvent;
- if ((xNode->getBegin() >>= aEvent))
+ if (xNode->getBegin() >>= aEvent)
bIsUserTriggered = (aEvent.Trigger == animations::EventTrigger::ON_NEXT);
}
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx
index d7cf667e7cf8..dc2006c462fb 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.cxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx
@@ -225,7 +225,7 @@ namespace internal
{
// no parent-supplied target, retrieve
// node target
- if( (xAnimateNode->getTarget() >>= aTarget.mxRef) )
+ if( xAnimateNode->getTarget() >>= aTarget.mxRef )
{
// pure shape target - set paragraph
// index to magic