diff options
Diffstat (limited to 'src/lib/corelib/language/evaluatorscriptclass.cpp')
-rw-r--r-- | src/lib/corelib/language/evaluatorscriptclass.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/corelib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp index c0e140d0b..55a9e1aac 100644 --- a/src/lib/corelib/language/evaluatorscriptclass.cpp +++ b/src/lib/corelib/language/evaluatorscriptclass.cpp @@ -376,7 +376,7 @@ QScriptClass::QueryFlags EvaluatorScriptClass::queryProperty(const QScriptValue // We assume that it's safe to save the result of the query in a member of the scriptclass. // It must be cleared in the property method before doing any further lookup. - QBS_ASSERT(m_queryResult.isNull(), return QueryFlags()); + QBS_ASSERT(m_queryResult.isNull(), return {}); if (debugProperties) qDebug() << "[SC] queryProperty " << object.objectId() << " " << name; @@ -393,7 +393,7 @@ QScriptClass::QueryFlags EvaluatorScriptClass::queryProperty(const QScriptValue if (!data) { if (debugProperties) qDebug() << "[SC] queryProperty: no data attached"; - return QScriptClass::QueryFlags(); + return {}; } return queryItemProperty(data, nameString); @@ -427,7 +427,7 @@ QScriptClass::QueryFlags EvaluatorScriptClass::queryItemProperty(const Evaluatio if (debugProperties) qDebug() << "[SC] queryProperty: no such property"; - return QScriptClass::QueryFlags(); + return {}; } QString EvaluatorScriptClass::resultToString(const QScriptValue &scriptValue) @@ -652,7 +652,7 @@ QScriptValue EvaluatorScriptClass::property(const QScriptValue &object, const QS m_queryResult.foundInParent = false; m_queryResult.data = nullptr; m_queryResult.itemOfProperty = nullptr; - QBS_ASSERT(data, return QScriptValue()); + QBS_ASSERT(data, {}); const auto qpt = static_cast<QueryPropertyType>(id); if (qpt == QPTParentProperty) { @@ -663,8 +663,8 @@ QScriptValue EvaluatorScriptClass::property(const QScriptValue &object, const QS ValuePtr value; m_queryResult.value.swap(value); - QBS_ASSERT(value, return QScriptValue()); - QBS_ASSERT(m_queryResult.isNull(), return QScriptValue()); + QBS_ASSERT(value, return {}); + QBS_ASSERT(m_queryResult.isNull(), return {}); if (debugProperties) qDebug() << "[SC] property " << name; |