qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QQmlJSScope: Switch QVector to QList 

QVector is just an alias for QList in Qt 6, so use
the latter directly.

Change-Id: I55792668400b4ad46929dc2b9b9bc1b68cbc4b00
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
This commit is contained in:
Michael Weghorn 2025-05-03 21:46:23 +02:00
parent 2a1792e9f9
commit 3f4ea7b2a9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qmlcompiler/qqmljsscope.cpp
View File

@ -1285,9 +1285,9 @@ QQmlJSScope::InlineComponentOrDocumentRootName QQmlJSScope::enclosingInlineCompo
return RootDocumentNameType(); return RootDocumentNameType();
} }
QVector<QQmlJSScope::ConstPtr> QQmlJSScope::childScopes() const QList<QQmlJSScope::ConstPtr> QQmlJSScope::childScopes() const
{ {
QVector<QQmlJSScope::ConstPtr> result; QList<QQmlJSScope::ConstPtr> result;
result.reserve(m_childScopes.size()); result.reserve(m_childScopes.size());
for (const auto &child : m_childScopes) for (const auto &child : m_childScopes)
result.append(child); result.append(child);

10
src/qmlcompiler/qqmljsscope_p.h
View File

@ -444,9 +444,9 @@ public:
std::optional<QString> inlineComponentName() const; std::optional<QString> inlineComponentName() const;
InlineComponentOrDocumentRootName enclosingInlineComponentName() const; InlineComponentOrDocumentRootName enclosingInlineComponentName() const;
QVector<QQmlJSScope::Ptr> childScopes(); QList<QQmlJSScope::Ptr> childScopes();
QVector<QQmlJSScope::ConstPtr> childScopes() const; QList<QQmlJSScope::ConstPtr> childScopes() const;
static QTypeRevision resolveTypes( static QTypeRevision resolveTypes(
const Ptr &self, const QQmlJS::ContextualTypes &contextualTypes, const Ptr &self, const QQmlJS::ContextualTypes &contextualTypes,
@ -541,8 +541,8 @@ private:
QHash<QString, QQmlJSMetaEnum> m_enumerations; QHash<QString, QQmlJSMetaEnum> m_enumerations;
QVector<QQmlJSAnnotation> m_annotations; QList<QQmlJSAnnotation> m_annotations;
QVector<QQmlJSScope::Ptr> m_childScopes; QList<QQmlJSScope::Ptr> m_childScopes;
QQmlJSScope::WeakPtr m_parentScope; QQmlJSScope::WeakPtr m_parentScope;
QString m_filePath; QString m_filePath;
@ -642,7 +642,7 @@ inline void QQmlJSScope::setInlineComponentName(const QString &inlineComponentNa
m_inlineComponentName = inlineComponentName; m_inlineComponentName = inlineComponentName;
} }
inline QVector<QQmlJSScope::Ptr> QQmlJSScope::childScopes() inline QList<QQmlJSScope::Ptr> QQmlJSScope::childScopes()
{ {
return m_childScopes; return m_childScopes;
} }