Fix deprecation warnings about QVector<T>::fromStdVector()

Fix warnings:
qscxmlstatemachine.cpp:1098:59: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations]
qscxmlstatemachine.cpp:1098:91: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations]
qscxmlstatemachine.cpp:1129:64: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations]
qscxmlstatemachine.cpp:1130:46: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations]
qscxmlstatemachine.cpp:1193:59: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations]
qscxmlstatemachine.cpp:1193:85: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations]
qscxmlstatemachineinfo.cpp:246:30: warning: 'static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]' is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations]
qscxmlstatemachineinfo.cpp:246:92: warning: 'static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]' is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations]

Change-Id: Ib7469b6b0f92de06779419629ba8170c6d96c04c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
 

1 files changed, 6 insertions, 4 deletions

diff --git a/src/scxml/qscxmlstatemachine.cpp b/src/scxml/qscxmlstatemachine.cpp
index b7431ba..8c9e6d4 100644
--- a/src/scxml/qscxmlstatemachine.cpp
+++ b/src/scxml/qscxmlstatemachine.cpp
@@ -1095,7 +1095,8 @@ void QScxmlStateMachinePrivate::exitStates(const OrderedSet &enabledTransitions)
 
     if (m_infoSignalProxy) {
         emit m_infoSignalProxy->statesExited(
-                QVector<QScxmlStateMachineInfo::StateId>::fromStdVector(statesToExitSorted));
+                QVector<QScxmlStateMachineInfo::StateId>(statesToExitSorted.begin(),
+                                                         statesToExitSorted.end()));
     }
 }
 
@@ -1126,8 +1127,8 @@ void QScxmlStateMachinePrivate::executeTransitionContent(const OrderedSet &enabl
 
     if (m_infoSignalProxy) {
         emit m_infoSignalProxy->transitionsTriggered(
-                QVector<QScxmlStateMachineInfo::TransitionId>::fromStdVector(
-                    enabledTransitions.list()));
+                QVector<QScxmlStateMachineInfo::TransitionId>(enabledTransitions.list().begin(),
+                                                              enabledTransitions.list().end()));
     }
 }
 
@@ -1190,7 +1191,8 @@ void QScxmlStateMachinePrivate::enterStates(const OrderedSet &enabledTransitions
         emitStateActive(s, true);
     if (m_infoSignalProxy) {
         emit m_infoSignalProxy->statesEntered(
-                QVector<QScxmlStateMachineInfo::StateId>::fromStdVector(sortedStates));
+                QVector<QScxmlStateMachineInfo::StateId>(sortedStates.begin(),
+                                                         sortedStates.end()));
     }
 }