diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp index 7461b378f24..aee58f74fdd 100644 --- a/src/libs/utils/aspects.cpp +++ b/src/libs/utils/aspects.cpp @@ -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 m_items; // Both owned and non-owned. @@ -2411,10 +2409,8 @@ public: std::function m_layouter; }; -} // Internal - -AspectContainer::AspectContainer(QObject *parent) - : QObject(parent), d(new Internal::AspectContainerPrivate) +AspectContainer::AspectContainer() + : d(new Internal::AspectContainerPrivate) {} /*! diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h index 0622c6a66f3..c2acbc5041d 100644 --- a/src/libs/utils/aspects.h +++ b/src/libs/utils/aspects.h @@ -830,7 +830,7 @@ class QTCREATOR_UTILS_EXPORT AspectContainer : public QObject Q_OBJECT public: - AspectContainer(QObject *parent = nullptr); + AspectContainer(); ~AspectContainer(); AspectContainer(const AspectContainer &) = delete; diff --git a/src/plugins/copilot/copilotprojectpanel.cpp b/src/plugins/copilot/copilotprojectpanel.cpp index f1eb5d119e8..034e43bc2dc 100644 --- a/src/plugins/copilot/copilotprojectpanel.cpp +++ b/src/plugins/copilot/copilotprojectpanel.cpp @@ -32,7 +32,8 @@ ProjectSettingsWidget *createCopilotProjectPanel(Project *project) using namespace ProjectExplorer; auto widget = new CopilotProjectSettingsWidget; - auto settings = new CopilotProjectSettings(project, widget); + auto settings = new CopilotProjectSettings(project); + settings->setParent(widget); QObject::connect(widget, &ProjectSettingsWidget::useGlobalSettingsChanged, diff --git a/src/plugins/copilot/copilotsettings.cpp b/src/plugins/copilot/copilotsettings.cpp index 22c38f30e26..ce67265d56e 100644 --- a/src/plugins/copilot/copilotsettings.cpp +++ b/src/plugins/copilot/copilotsettings.cpp @@ -91,8 +91,7 @@ CopilotSettings::CopilotSettings() readSettings(); } -CopilotProjectSettings::CopilotProjectSettings(ProjectExplorer::Project *project, QObject *parent) - : AspectContainer(parent) +CopilotProjectSettings::CopilotProjectSettings(ProjectExplorer::Project *project) { setAutoApply(true); diff --git a/src/plugins/copilot/copilotsettings.h b/src/plugins/copilot/copilotsettings.h index 2f66f48ffba..11e9ace9c6b 100644 --- a/src/plugins/copilot/copilotsettings.h +++ b/src/plugins/copilot/copilotsettings.h @@ -25,7 +25,7 @@ CopilotSettings &settings(); class CopilotProjectSettings : public Utils::AspectContainer { public: - CopilotProjectSettings(ProjectExplorer::Project *project, QObject *parent = nullptr); + explicit CopilotProjectSettings(ProjectExplorer::Project *project); void save(ProjectExplorer::Project *project); void setUseGlobalSettings(bool useGlobalSettings); diff --git a/src/plugins/projectexplorer/projectconfiguration.cpp b/src/plugins/projectexplorer/projectconfiguration.cpp index 082d978913a..9b88e47bb5e 100644 --- a/src/plugins/projectexplorer/projectconfiguration.cpp +++ b/src/plugins/projectexplorer/projectconfiguration.cpp @@ -17,11 +17,11 @@ const char DISPLAY_NAME_KEY[] = "ProjectExplorer.ProjectConfiguration.DisplayNam // ProjectConfiguration ProjectConfiguration::ProjectConfiguration(QObject *parent, Target *target, Utils::Id id) - : AspectContainer(parent) - , m_target(target) + : m_target(target) , m_id(id) { QTC_CHECK(parent); + setParent(parent); QTC_CHECK(target); QTC_CHECK(id.isValid()); setObjectName(id.toString());