RealDataSelectorWidget::importData1D vs 2D: make more similar; expand auto

GUI/View/Import/RealDataSelectorWidget.cpp

@@ -250,7 +250,6 @@ void RealDataSelectorWidget::importData1D()
         Q_NULLPTR, "Open Intensity Files", dirname, filters, &selectedFilter,
         appSettings->useNativeFileDialog() ? QFileDialog::Options()
                                            : QFileDialog::DontUseNativeDialog);
-
     if (fileNames.isEmpty())
         return;
 
@@ -258,7 +257,8 @@ void RealDataSelectorWidget::importData1D()
     ProjectManager::instance()->setRecentlyUsedImportFilter1D(selectedFilter);
 
     const AbstractDataLoader* selectedLoader = loaderOfFilter.value(selectedFilter, nullptr);
-    for (const auto& fileName : fileNames) {
+
+    for (const QString& fileName : fileNames) {
         RealItem* realItem = m_treeModel->insertSpecularDataItem();
         realItem->setRealItemName(QFileInfo(fileName).baseName());
         realItem->setNativeFileName(fileName);
@@ -274,6 +274,7 @@ void RealDataSelectorWidget::importData1D()
                                         errorText);
         }
     }
+
     gProjectDocument.value()->setModified();
 }
 
@@ -295,8 +296,8 @@ void RealDataSelectorWidget::importData2D()
     addFilter(IO::any2D, "All (*.*)");
 
     QString selectedFilter = ProjectManager::instance()->recentlyUsedImportFilter2D();
-
     const QString dirname = ProjectManager::instance()->userImportDir();
+
     const QStringList fileNames = QFileDialog::getOpenFileNames(
         Q_NULLPTR, "Open Intensity Files", dirname, filters, &selectedFilter,
         appSettings->useNativeFileDialog() ? QFileDialog::Options()
@@ -307,11 +308,11 @@ void RealDataSelectorWidget::importData2D()
     ProjectManager::instance()->setImportDirFromFilePath(fileNames[0]);
     ProjectManager::instance()->setRecentlyUsedImportFilter2D(selectedFilter);
 
-    const auto selectedLoader = loaderOfFilter.value(selectedFilter, IO::any2D);
+    const IO::Filetype2D ftype = loaderOfFilter.value(selectedFilter, IO::any2D);
 
-    for (const auto& fileName : fileNames) {
+    for (const QString& fileName : fileNames) {
         std::unique_ptr<Datafield> data =
-            GUI::View::ImportDataUtil::Import2dData(fileName, selectedLoader);
+            GUI::View::ImportDataUtil::Import2dData(fileName, ftype);
         if (!data)
             continue;
         RealItem* realItem = m_treeModel->insertIntensityDataItem();
@@ -332,6 +333,7 @@ void RealDataSelectorWidget::importData2D()
             GUI::View::Helpers::warning(this, "File import", message);
         }
     }
+
     gProjectDocument.value()->setModified();
 }