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:
@@ -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,
|
||||
|
||||
@@ -91,8 +91,7 @@ CopilotSettings::CopilotSettings()
|
||||
readSettings();
|
||||
}
|
||||
|
||||
CopilotProjectSettings::CopilotProjectSettings(ProjectExplorer::Project *project, QObject *parent)
|
||||
: AspectContainer(parent)
|
||||
CopilotProjectSettings::CopilotProjectSettings(ProjectExplorer::Project *project)
|
||||
{
|
||||
setAutoApply(true);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user