From: Kent Hansen <kent.hansen@nokia.com>
Date: Wed, 5 Oct 2011 10:43:32 +0000 (+0200)
Subject: Remove redundant checks in qdeclarativestategroup
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=402363215943976f2fa5b6b2db9b7ca588505df2;p=konrad%2Fqtdeclarative.git

Remove redundant checks in qdeclarativestategroup

Checking once should be enough for everyone.

Task-number: QTBUG-20482
Change-Id: I6cc1c608d9c1da0f4f745e436b9611937a8db160
Reviewed-on: http://codereview.qt-project.org/6054
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
---

diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp
index 4f95930..a349ea9 100644
--- a/src/declarative/util/qdeclarativestategroup.cpp
+++ b/src/declarative/util/qdeclarativestategroup.cpp
@@ -444,7 +444,7 @@ void QDeclarativeStateGroupPrivate::setCurrentStateInternal(const QString &state
 
     applyingState = true;
 
-    QDeclarativeTransition *transition = (ignoreTrans || ignoreTrans) ? 0 : findTransition(currentState, state);
+    QDeclarativeTransition *transition = ignoreTrans ? 0 : findTransition(currentState, state);
     if (stateChangeDebug()) {
         qWarning() << this << "Changing state.  From" << currentState << ". To" << state;
         if (transition)
diff --git a/src/qtquick1/util/qdeclarativestategroup.cpp b/src/qtquick1/util/qdeclarativestategroup.cpp
index 539fbba..70b7b37 100644
--- a/src/qtquick1/util/qdeclarativestategroup.cpp
+++ b/src/qtquick1/util/qdeclarativestategroup.cpp
@@ -445,7 +445,7 @@ void QDeclarative1StateGroupPrivate::setCurrentStateInternal(const QString &stat
 
     applyingState = true;
 
-    QDeclarative1Transition *transition = (ignoreTrans || ignoreTrans) ? 0 : findTransition(currentState, state);
+    QDeclarative1Transition *transition = ignoreTrans ? 0 : findTransition(currentState, state);
     if (stateChangeDebug()) {
         qWarning() << this << "Changing state.  From" << currentState << ". To" << state;
         if (transition)