diff --git a/src/libs/qmuparser/qmuparserbase.cpp b/src/libs/qmuparser/qmuparserbase.cpp index 786f4aa37..a340d882f 100644 --- a/src/libs/qmuparser/qmuparserbase.cpp +++ b/src/libs/qmuparser/qmuparserbase.cpp @@ -748,7 +748,7 @@ void QmuParserBase::SetExpr(const string_type &a_sExpr) \throw exception_type If the function token is not a string function */ QmuParserBase::token_type QmuParserBase::ApplyStrFunc(const token_type &a_FunTok, - const std::vector &a_vArg) const + const QVector &a_vArg) const { if (a_vArg.back().GetCode()!=cmSTRING) Error(ecSTRING_EXPECTED, m_pTokenReader->GetPos(), a_FunTok.GetAsString()); @@ -824,7 +824,7 @@ void QmuParserBase::SetExpr(const string_type &a_sExpr) // Collect the numeric function arguments from the value stack and store them // in a vector - std::vector stArg; + QVector stArg; for (int i=0; i valbuf_type; + typedef QVector valbuf_type; /** \brief Type for a vector of strings. */ - typedef std::vector stringbuf_type; + typedef QVector stringbuf_type; /** \brief Typedef for the token reader. */ typedef QmuParserTokenReader token_reader_type; @@ -245,7 +245,7 @@ private: void ApplyFunc(QStack &a_stOpt, QStack &a_stVal, int iArgCount) const; token_type ApplyStrFunc(const token_type &a_FunTok, - const std::vector &a_vArg) const; + const QVector &a_vArg) const; int GetOprtPrecedence(const token_type &a_Tok) const; EOprtAssociativity GetOprtAssociativity(const token_type &a_Tok) const; diff --git a/src/libs/qmuparser/qmuparserbytecode.h b/src/libs/qmuparser/qmuparserbytecode.h index 3e554f15b..5e9b3db3a 100644 --- a/src/libs/qmuparser/qmuparserbytecode.h +++ b/src/libs/qmuparser/qmuparserbytecode.h @@ -90,7 +90,7 @@ private: typedef QmuParserToken token_type; /** \brief Token vector for storing the RPN. */ - typedef std::vector rpn_type; + typedef QVector rpn_type; /** \brief Position in the Calculation array. */ unsigned m_iStackPos; diff --git a/src/libs/qmuparser/qmuparsererror.h b/src/libs/qmuparser/qmuparsererror.h index ea51f42a0..e24ea5ae6 100644 --- a/src/libs/qmuparser/qmuparsererror.h +++ b/src/libs/qmuparser/qmuparsererror.h @@ -110,7 +110,7 @@ public: string_type operator[](unsigned a_iIdx) const; private: - std::vector m_vErrMsg; ///< A vector with the predefined error messages + QVector m_vErrMsg; ///< A vector with the predefined error messages static const self_type m_Instance; ///< The instance pointer }; diff --git a/src/libs/qmuparser/qmuparsertest.cpp b/src/libs/qmuparser/qmuparsertest.cpp index 59eedf24d..070b9d144 100644 --- a/src/libs/qmuparser/qmuparsertest.cpp +++ b/src/libs/qmuparser/qmuparsertest.cpp @@ -1228,7 +1228,7 @@ namespace qmu try { // Test copy constructor - std::vector vParser; + QVector vParser; vParser.push_back(*(p1.get())); qmu::QmuParser p2 = vParser[0]; // take parser from vector diff --git a/src/libs/qmuparser/qmuparsertest.h b/src/libs/qmuparser/qmuparsertest.h index 79514f282..4baa0eed0 100644 --- a/src/libs/qmuparser/qmuparsertest.h +++ b/src/libs/qmuparser/qmuparsertest.h @@ -183,7 +183,7 @@ namespace qmu void Run(); private: - std::vector m_vTestFun; + QVector m_vTestFun; void AddTest(testfun_type a_pFun); // Test Double Parser