forked from qt-creator/qt-creator
Utils: Remove AspectContainer ctor's parent parameter
Instead use setParent in the two cases that use it. The parent gets in the way when attempting to derive AspectContainer from BaseAspect. Change-Id: I6079beb0e00334133da115b714bc5186064c6722 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
@@ -2399,9 +2399,7 @@ void TextDisplay::setText(const QString &message)
|
||||
Sub-aspects ownership can be declared using \a setOwnsSubAspects.
|
||||
*/
|
||||
|
||||
namespace Internal {
|
||||
|
||||
class AspectContainerPrivate
|
||||
class Internal::AspectContainerPrivate
|
||||
{
|
||||
public:
|
||||
QList<BaseAspect *> m_items; // Both owned and non-owned.
|
||||
@@ -2411,10 +2409,8 @@ public:
|
||||
std::function<Layouting::LayoutItem ()> m_layouter;
|
||||
};
|
||||
|
||||
} // Internal
|
||||
|
||||
AspectContainer::AspectContainer(QObject *parent)
|
||||
: QObject(parent), d(new Internal::AspectContainerPrivate)
|
||||
AspectContainer::AspectContainer()
|
||||
: d(new Internal::AspectContainerPrivate)
|
||||
{}
|
||||
|
||||
/*!
|
||||
|
||||
Reference in New Issue
Block a user