Utils: Add AspectList::createAndAddItem

Adds a function to add a "default" constructed new item to the list.

Change-Id: I3d826b6f3e3705ae431efa5d778219f431509ea8
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>

src/libs/utils/aspects.cpp

@@ -3127,6 +3127,11 @@ QList<std::shared_ptr<BaseAspect>> AspectList::volatileItems() const
     return d->volatileItems;
 }
 
+std::shared_ptr<BaseAspect> AspectList::createAndAddItem()
+{
+    return addItem(d->createItem());
+}
+
 std::shared_ptr<BaseAspect> AspectList::addItem(const std::shared_ptr<BaseAspect> &item)
 {
     if (undoStack())

src/libs/utils/aspects.h

@@ -1026,6 +1026,7 @@ public:
     QList<std::shared_ptr<BaseAspect>> items() const;
     QList<std::shared_ptr<BaseAspect>> volatileItems() const;
 
+    std::shared_ptr<BaseAspect> createAndAddItem();
     std::shared_ptr<BaseAspect> addItem(const std::shared_ptr<BaseAspect> &item);
     std::shared_ptr<BaseAspect> actualAddItem(const std::shared_ptr<BaseAspect> &item);
 

src/plugins/compilerexplorer/compilerexplorereditor.cpp

@@ -216,7 +216,10 @@ SourceEditorWidget::SourceEditorWidget(const std::shared_ptr<SourceSettings> &se
 
     auto addCompilerButton = new QPushButton;
     addCompilerButton->setText(Tr::tr("Add compiler"));
-    connect(addCompilerButton, &QPushButton::clicked, this, &SourceEditorWidget::addCompiler);
+    connect(addCompilerButton,
+            &QPushButton::clicked,
+            &settings->compilers,
+            &AspectList::createAndAddItem);
 
     auto removeSourceButton = new QPushButton;
     removeSourceButton->setIcon(Utils::Icons::EDIT_CLEAR.icon());
@@ -575,12 +578,6 @@ void EditorWidget::addSourceEditor(const std::shared_ptr<SourceSettings> &source
         setupHelpWidget();
     });
 
-    connect(sourceEditor, &SourceEditorWidget::addCompiler, this, [sourceSettings]() {
-        auto newCompiler = std::make_shared<CompilerSettings>(sourceSettings->apiConfigFunction());
-        newCompiler->setLanguageId(sourceSettings->languageId());
-        sourceSettings->compilers.addItem(newCompiler);
-    });
-
     connect(sourceEditor, &SourceEditorWidget::gotFocus, this, [this]() {
         m_actionHandler.updateCurrentEditor();
     });
@@ -725,8 +722,8 @@ QWidget *EditorWidget::createHelpWidget() const
     auto w = new HelperWidget;
     connect(w,
             &HelperWidget::addSource,
-            m_document->settings(),
+            &m_document->settings()->m_sources,
-            &CompilerExplorerSettings::addNewSource);
+            &AspectList::createAndAddItem);
     return w;
 }
 
@@ -792,8 +789,8 @@ QWidget *Editor::toolBar()
 
         connect(newSource,
                 &QAction::triggered,
-                m_document->settings(),
+                &m_document->settings()->m_sources,
-                &CompilerExplorerSettings::addNewSource);
+                &AspectList::createAndAddItem);
     }
 
     return m_toolBar.get();

src/plugins/compilerexplorer/compilerexplorereditor.h

@@ -130,7 +130,6 @@ public:
 
 signals:
     void sourceCodeChanged();
-    void addCompiler();
     void remove();
     void gotFocus();
 

src/plugins/compilerexplorer/compilerexplorersettings.cpp

@@ -337,10 +337,4 @@ CompilerExplorerSettings::CompilerExplorerSettings()
 
 CompilerExplorerSettings::~CompilerExplorerSettings() = default;
 
-void CompilerExplorerSettings::addNewSource()
-{
-    auto newSource = std::make_shared<SourceSettings>([this] { return apiConfig(); });
-    m_sources.addItem(newSource);
-}
-
 } // namespace CompilerExplorer

src/plugins/compilerexplorer/compilerexplorersettings.h

@@ -41,8 +41,6 @@ public:
         return Api::Config(m_networkAccessManager, compilerExplorerUrl());
     }
 
-    void addNewSource();
-
     QNetworkAccessManager *networkAccessManager() const { return m_networkAccessManager; }
 
 private: