aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrect use of Q_NORETURN.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-02-09 17:03:18 +02:00
parent ac244d92ee
commit 5daab80a09
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qmuparser/qmuparserbase.cpp
View File

@ -1648,7 +1648,7 @@ qreal QmuParserBase::ParseString() const
* @param a_sTok [in] The token string representation associated with the error. * @param a_sTok [in] The token string representation associated with the error.
* @throw ParserException always throws thats the only purpose of this function. * @throw ParserException always throws thats the only purpose of this function.
*/ */
void Q_NORETURN QmuParserBase::Error(EErrorCodes a_iErrc, qmusizetype a_iPos, const QString &a_sTok) const Q_NORETURN void QmuParserBase::Error(EErrorCodes a_iErrc, qmusizetype a_iPos, const QString &a_sTok) const
{ {
throw qmu::QmuParserError (a_iErrc, a_sTok, m_pTokenReader->GetExpr(), a_iPos); throw qmu::QmuParserError (a_iErrc, a_sTok, m_pTokenReader->GetExpr(), a_iPos);
} }

2
src/libs/qmuparser/qmuparserbase.h
View File

@ -121,7 +121,7 @@ public:
const QString& ValidInfixOprtChars() const; const QString& ValidInfixOprtChars() const;
void SetArgSep(char_type cArgSep); void SetArgSep(char_type cArgSep);
QChar GetArgSep() const; QChar GetArgSep() const;
void Q_NORETURN Error(EErrorCodes a_iErrc, qmusizetype a_iPos = -1, const QString &a_sTok = QString() ) const; Q_NORETURN void Error(EErrorCodes a_iErrc, qmusizetype a_iPos = -1, const QString &a_sTok = QString() ) const;
template<typename T> template<typename T>
void DefineFun(const QString &a_strName, T a_pFun, bool a_bAllowOpt = true); void DefineFun(const QString &a_strName, T a_pFun, bool a_bAllowOpt = true);

2
src/libs/qmuparser/qmuparsertokenreader.cpp
View File

@ -1012,7 +1012,7 @@ auto QmuParserTokenReader::IsString ( token_type &a_Tok ) -> bool
* @param a_sTok [in] The token string representation associated with the error. * @param a_sTok [in] The token string representation associated with the error.
* @throw ParserException always throws thats the only purpose of this function. * @throw ParserException always throws thats the only purpose of this function.
*/ */
void Q_NORETURN QmuParserTokenReader::Error ( EErrorCodes a_iErrc, qmusizetype a_iPos, const QString &a_sTok ) const Q_NORETURN void QmuParserTokenReader::Error (EErrorCodes a_iErrc, qmusizetype a_iPos, const QString &a_sTok ) const
{ {
m_pParser->Error ( a_iErrc, a_iPos, a_sTok ); m_pParser->Error ( a_iErrc, a_iPos, a_sTok );
} }

2
src/libs/qmuparser/qmuparsertokenreader.h
View File

@ -142,7 +142,7 @@ private:
auto IsStrVarTok(token_type &a_Tok) -> bool; auto IsStrVarTok(token_type &a_Tok) -> bool;
auto IsUndefVarTok(token_type &a_Tok) -> bool; auto IsUndefVarTok(token_type &a_Tok) -> bool;
auto IsString(token_type &a_Tok) -> bool; auto IsString(token_type &a_Tok) -> bool;
void Q_NORETURN Error(EErrorCodes a_iErrc, qmusizetype a_iPos = -1, const QString &a_sTok = QString() ) const; Q_NORETURN void Error(EErrorCodes a_iErrc, qmusizetype a_iPos = -1, const QString &a_sTok = QString() ) const;
auto SaveBeforeReturn(const token_type &tok) -> token_type&; auto SaveBeforeReturn(const token_type &tok) -> token_type&;
}; };