From e95a29c08ea57efd2cab7797492826a78b33528a Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 9 Feb 2023 17:14:57 +0200 Subject: [PATCH] Use of overloaded operator '=' is ambiguous (with operand types 'QChar' and 'qmu::char_type' (aka 'wchar_t')). --- src/libs/qmuparser/qmuparserbase.cpp | 2 +- src/libs/qmuparser/qmuparsertokenreader.cpp | 2 +- src/libs/qmuparser/qmuparsertokenreader.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/qmuparser/qmuparserbase.cpp b/src/libs/qmuparser/qmuparserbase.cpp index efe5812ec..339697714 100644 --- a/src/libs/qmuparser/qmuparserbase.cpp +++ b/src/libs/qmuparser/qmuparserbase.cpp @@ -440,7 +440,7 @@ void QmuParserBase::SetExpr(const QString &a_sExpr) { // Check locale compatibility std::locale loc; - if (m_pTokenReader->GetArgSep()==std::use_facet >(loc).decimal_point()) + if (m_pTokenReader->GetArgSep() == QChar(std::use_facet >(loc).decimal_point())) { Error(ecLOCALE); } diff --git a/src/libs/qmuparser/qmuparsertokenreader.cpp b/src/libs/qmuparser/qmuparsertokenreader.cpp index 55fcc7bb0..3f25c3f10 100644 --- a/src/libs/qmuparser/qmuparsertokenreader.cpp +++ b/src/libs/qmuparser/qmuparsertokenreader.cpp @@ -487,7 +487,7 @@ auto QmuParserTokenReader::IsArgSep ( token_type &a_Tok ) -> bool // copy the separator into null terminated string QString szSep; szSep[0] = m_cArgSep; - szSep[1] = 0; + szSep[1] = QChar::Null; if ( m_iSynFlags & noARG_SEP ) { diff --git a/src/libs/qmuparser/qmuparsertokenreader.h b/src/libs/qmuparser/qmuparsertokenreader.h index 65e195a55..71d2f7a46 100644 --- a/src/libs/qmuparser/qmuparsertokenreader.h +++ b/src/libs/qmuparser/qmuparsertokenreader.h @@ -197,7 +197,7 @@ inline void QmuParserTokenReader::IgnoreUndefVar ( bool bIgnore ) //--------------------------------------------------------------------------------------------------------------------- inline void QmuParserTokenReader::SetArgSep ( char_type cArgSep ) { - m_cArgSep = cArgSep; + m_cArgSep = QChar(cArgSep); } //---------------------------------------------------------------------------------------------------------------------