From c46eec096f30b69c1b683f8417d27e0234590bfa Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Fri, 18 Oct 2019 16:44:55 +0200 Subject: QStateMachine: Don't scream at the user Change-Id: I171606d10985bc7338b0f24ceb142fc0d88e7932 Reviewed-by: Thiago Macieira Reviewed-by: Leena Miettinen --- src/corelib/statemachine/qstatemachine.cpp | 4 ++-- .../auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 945e36968f..a97700e5d0 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -1498,7 +1498,7 @@ void QStateMachinePrivate::setError(QStateMachine::Error errorCode, QAbstractSta case QStateMachine::StateMachineChildModeSetToParallelError: Q_ASSERT(currentContext != nullptr); - errorString = QStateMachine::tr("Child mode of state machine '%1' is not 'ExclusiveStates'!") + errorString = QStateMachine::tr("Child mode of state machine '%1' is not 'ExclusiveStates'.") .arg(currentContext->objectName()); break; @@ -2469,7 +2469,7 @@ QStateMachine::QStateMachine(QObject *parent) and \a parent. \warning Do not set the \a childMode to anything else than \l{ExclusiveStates}, otherwise the - state machine is invalid, and might work incorrectly! + state machine is invalid, and might work incorrectly. */ QStateMachine::QStateMachine(QState::ChildMode childMode, QObject *parent) : QState(*new QStateMachinePrivate, /*parentState=*/0) diff --git a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp index 72a6f0360d..4b13ac45cc 100644 --- a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp +++ b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp @@ -338,7 +338,7 @@ void tst_QStateMachine::transitionToRootState() machine.postEvent(new QEvent(QEvent::User)); QTest::ignoreMessage(QtWarningMsg, "Unrecoverable error detected in running state machine: " - "Child mode of state machine 'machine' is not 'ExclusiveStates'!"); + "Child mode of state machine 'machine' is not 'ExclusiveStates'."); QCoreApplication::processEvents(); QVERIFY(machine.configuration().isEmpty()); QVERIFY(!machine.isRunning()); @@ -1064,7 +1064,7 @@ void tst_QStateMachine::transitionToStateNotInGraph() machine.start(); QTest::ignoreMessage(QtWarningMsg, "Unrecoverable error detected in running state machine: " - "Child mode of state machine '' is not 'ExclusiveStates'!"); + "Child mode of state machine '' is not 'ExclusiveStates'."); QCoreApplication::processEvents(); QCOMPARE(machine.isRunning(), false); @@ -2103,7 +2103,7 @@ void tst_QStateMachine::parallelRootState() QVERIFY(finishedSpy.isValid()); machine.start(); QTest::ignoreMessage(QtWarningMsg, "Unrecoverable error detected in running state machine: " - "Child mode of state machine '' is not 'ExclusiveStates'!"); + "Child mode of state machine '' is not 'ExclusiveStates'."); QTRY_COMPARE(startedSpy.count(), 1); QCOMPARE(machine.configuration().size(), 4); QVERIFY(machine.configuration().contains(s1)); @@ -3316,7 +3316,7 @@ void tst_QStateMachine::targetStateWithNoParent() machine.start(); QTest::ignoreMessage(QtWarningMsg, "Unrecoverable error detected in running state machine: " - "Child mode of state machine '' is not 'ExclusiveStates'!"); + "Child mode of state machine '' is not 'ExclusiveStates'."); TEST_ACTIVE_CHANGED(s1, 2); QTRY_COMPARE(startedSpy.count(), 1); QCOMPARE(machine.isRunning(), false); -- cgit v1.2.3