summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-05-05 16:30:47 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-05-05 16:30:47 (GMT)
commitb8a4216f2fb5bc6e5fd5b54c661344e60fc9093c (patch)
tree83becedbe74d055aa8c4127aeee48d1e2e2bc206
parent51ffea0f7bed9e1636dd66d8d81be2d36e9ffa6e (diff)
downloadQt-b8a4216f2fb5bc6e5fd5b54c661344e60fc9093c.zip
Qt-b8a4216f2fb5bc6e5fd5b54c661344e60fc9093c.tar.gz
Qt-b8a4216f2fb5bc6e5fd5b54c661344e60fc9093c.tar.bz2
get rid of warnings
-rw-r--r--src/corelib/statemachine/qhistorystate.cpp2
-rw-r--r--src/corelib/statemachine/qstatemachine.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/statemachine/qhistorystate.cpp b/src/corelib/statemachine/qhistorystate.cpp
index fd6f53d..b6ec471 100644
--- a/src/corelib/statemachine/qhistorystate.cpp
+++ b/src/corelib/statemachine/qhistorystate.cpp
@@ -202,6 +202,7 @@ void QHistoryState::setHistoryType(HistoryType type)
*/
void QHistoryState::onEntry(QEvent *event)
{
+ Q_UNUSED(event);
}
/*!
@@ -209,6 +210,7 @@ void QHistoryState::onEntry(QEvent *event)
*/
void QHistoryState::onExit(QEvent *event)
{
+ Q_UNUSED(event);
}
/*!
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 8b0b4f3..232d801 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -661,7 +661,7 @@ void QStateMachinePrivate::applyProperties(const QList<QAbstractTransition*> &tr
// before the state that assigned them is exited. If state does not explicitly
// assign a property which is assigned by the parent, it inherits the parent's assignment.
QState *parentState = s;
- while (parentState = parentState->parentState()) {
+ while ((parentState = parentState->parentState()) != 0) {
assignments = QStatePrivate::get(parentState)->propertyAssignments;
for (int j=0; j<assignments.size(); ++j) {
const QPropertyAssignment &assn = assignments.at(j);