expand auto

GUI/View/Project/PyImportAssistant.cpp

@@ -107,7 +107,7 @@ std::unique_ptr<MultiLayer> createMultiLayer(const QString& snippet, const QStri
     PyObjectPtr result{PyInterpreter::createMultiLayerFromPython(
         result_ptr, snippet.toStdString(), funcName.toStdString(), bornagainDir())};
 
-    std::unique_ptr<MultiLayer> multilayer_ptr(reinterpret_cast<MultiLayer*>(result_ptr));
+    std::unique_ptr<MultiLayer> multilayer_ptr(reinterpret_cast<MultiLayer*>(result_ptr)->clone());
 
     if (!result.valid()) {
         QApplication::restoreOverrideCursor();
@@ -184,9 +184,9 @@ std::unique_ptr<MultiLayer> PyImportAssistant::importMultiLayer()
     if (funcName.isEmpty())
         return {};
 
-    auto sample = createMultiLayer(snippet, funcName);
+    std::unique_ptr<MultiLayer> sample = createMultiLayer(snippet, funcName);
     if (!sample)
-        return {};
+        throw std::runtime_error("Import did not yield MultiLayer object");
 
     if (sample->sampleName() == "Unnamed")
         sample->setSampleName(GUI::Util::Path::baseName(fileName).toStdString());

GUI/View/SampleDesigner/SampleListModel.cpp

@@ -162,14 +162,13 @@ QModelIndex SampleListModel::createSampleFromExamples(const QString& className,
 #ifdef BORNAGAIN_PYTHON
 QModelIndex SampleListModel::createSampleFromPython()
 {
-    auto sample = PyImportAssistant::importMultiLayer();
+    std::unique_ptr<MultiLayer> sample = PyImportAssistant::importMultiLayer();
     if (!sample)
-        return {}; // any messages already shown to user; no dlg necessary anymore
+        return {}; // any messages already shown to user
 
-
-    auto* sampleItem = PyImportAssistant::itemizeSample(*sample);
+    SampleItem* sampleItem = PyImportAssistant::itemizeSample(*sample);
     if (!sampleItem)
-        return {}; // any messages already shown to user; no dlg necessary anymore
+        return {}; // any messages already shown to user
 
     sampleItem->setDescription("Imported from python code");