feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Don't derive BaseAspects from QList

Browse Source 
Use composition instead.
Exporting classes (on Windows) that are derived from QList doesn't seem
to work with Qt6, and it can be argued that composition is to be favored
anyhow.

Task-number: QTCREATORBUG-24098
Change-Id: Icc18fac6680fa09e50b60ed676265e85ee00a89e
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-11-02 19:05:24 +01:00
parent e101e83f84
commit 3ec8169137
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/utils/aspects.cpp
View File

@@ -174,7 +174,7 @@ BaseAspects::BaseAspects() = default;
*/
BaseAspects::~BaseAspects()
{
qDeleteAll(base());
qDeleteAll(m_aspects);
}
/*!
@@ -184,7 +184,7 @@ BaseAspects::~BaseAspects()
*/
BaseAspect *BaseAspects::aspect(Utils::Id id) const
{
return Utils::findOrDefault(base(), Utils::equal(&BaseAspect::id, id));
return Utils::findOrDefault(m_aspects, Utils::equal(&BaseAspect::id, id));
}
/*!
@@ -192,7 +192,7 @@ BaseAspect *BaseAspects::aspect(Utils::Id id) const
*/
void BaseAspects::fromMap(const QVariantMap &map) const
{
for (BaseAspect *aspect : *this)
for (BaseAspect *aspect : m_aspects)
aspect->fromMap(map);
}
@@ -201,7 +201,7 @@ void BaseAspects::fromMap(const QVariantMap &map) const
*/
void BaseAspects::toMap(QVariantMap &map) const
{
for (BaseAspect *aspect : *this)
for (BaseAspect *aspect : m_aspects)
aspect->toMap(map);
}