From c159dc897e9db612d2223cb2d19555c28b722f70 Mon Sep 17 00:00:00 2001 From: Renaud Guezennec Date: Tue, 28 Nov 2017 15:46:18 +0100 Subject: -Change QList to std::vector --- diceparser.cpp | 6 +++--- diceparser.h | 5 ++--- node/mergenode.cpp | 8 ++++---- node/mergenode.h | 6 +++--- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/diceparser.cpp b/diceparser.cpp index 44e69b4..178a6cb 100644 --- a/diceparser.cpp +++ b/diceparser.cpp @@ -157,14 +157,14 @@ void DiceParser::insertAlias(DiceAlias* dice, int i) bool DiceParser::parseLine(QString str) { m_errorMap.clear(); - if(!m_startNodes.isEmpty()) + if(!m_startNodes.empty()) { qDeleteAll(m_startNodes); m_startNodes.clear(); } m_currentTreeHasSeparator=false; StartingNode* start = new StartingNode(); - m_startNodes.append(start); + m_startNodes.push_back(start); ExecutionNode* newNode = nullptr; m_current = start; @@ -887,7 +887,7 @@ bool DiceParser::readOperator(QString& str,ExecutionNode* previous) return false; } previous->setNextNode(nullptr); - m_startNodes.append(nodeExec); + m_startNodes.push_back(nodeExec); m_currentTreeHasSeparator = true; return true; } diff --git a/diceparser.h b/diceparser.h index b844796..9b00d72 100644 --- a/diceparser.h +++ b/diceparser.h @@ -326,14 +326,13 @@ private: QMap* m_OptionOp; QMap* m_nodeActionMap; QList* m_aliasList; - QStringList* m_commandList; + QStringList* m_commandList; QMap m_errorMap; QMap m_warningMap; - ExecutionNode* m_start = nullptr; - QList m_startNodes; + std::vector m_startNodes; ExecutionNode* m_current; QString m_command; ParsingToolBox* m_parsingToolbox; diff --git a/node/mergenode.cpp b/node/mergenode.cpp index f2323df..362a23a 100644 --- a/node/mergenode.cpp +++ b/node/mergenode.cpp @@ -67,9 +67,9 @@ void MergeNode::run(ExecutionNode* previous) } } - auto first = m_startList->first(); + auto first = m_startList->front(); m_startList->clear(); - m_startList->append(first); + m_startList->push_back(first); if(nullptr!=m_nextNode) { @@ -116,12 +116,12 @@ ExecutionNode* MergeNode::getCopy() const } -QList* MergeNode::getStartList() const +std::vector* MergeNode::getStartList() const { return m_startList; } -void MergeNode::setStartList(QList* startList) +void MergeNode::setStartList(std::vector* startList) { m_startList = startList; } diff --git a/node/mergenode.h b/node/mergenode.h index 0626fb2..34f1200 100644 --- a/node/mergenode.h +++ b/node/mergenode.h @@ -36,15 +36,15 @@ public: virtual QString toString(bool withLabel)const; virtual qint64 getPriority() const; virtual ExecutionNode *getCopy() const; - QList* getStartList() const; - void setStartList(QList* startList); + std::vector* getStartList() const; + void setStartList(std::vector* startList); private: ExecutionNode *getLatestNode(ExecutionNode *node); private: DiceResult* m_diceResult; - QList* m_startList; + std::vector* m_startList; }; #endif // NUMBERNODE_H -- cgit v1.2.3-70-g09d2