aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlstatemachine/tst_qqmlstatemachine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qml/qqmlstatemachine/tst_qqmlstatemachine.cpp')
-rw-r--r--tests/auto/qml/qqmlstatemachine/tst_qqmlstatemachine.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/auto/qml/qqmlstatemachine/tst_qqmlstatemachine.cpp b/tests/auto/qml/qqmlstatemachine/tst_qqmlstatemachine.cpp
index 5231af88be..68ed22c01c 100644
--- a/tests/auto/qml/qqmlstatemachine/tst_qqmlstatemachine.cpp
+++ b/tests/auto/qml/qqmlstatemachine/tst_qqmlstatemachine.cpp
@@ -55,10 +55,7 @@ public:
};
public:
- CppObject()
- : QObject()
- , m_objectState(State0)
- {}
+ CppObject() {}
ObjectState objectState() const { return m_objectState; }
void setObjectState(ObjectState objectState) { m_objectState = objectState; emit objectStateChanged();}
@@ -68,7 +65,7 @@ signals:
void mySignal(int signalState);
private:
- ObjectState m_objectState;
+ ObjectState m_objectState = State0;
};
tst_qqmlstatemachine::tst_qqmlstatemachine()
@@ -86,7 +83,7 @@ void tst_qqmlstatemachine::tst_cppObjectSignal()
QQmlContext *ctxt = engine.rootContext();
ctxt->setContextProperty("_cppObject", &cppObject);
QScopedPointer<QObject> rootObject(component.create());
- QVERIFY(rootObject != 0);
+ QVERIFY(rootObject != nullptr);
// wait for state machine to start
QTRY_VERIFY(rootObject->property("running").toBool());