From bd10894caef9bca5f06606d5b881b0ba69f15f02 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Fri, 5 Nov 2021 16:53:28 +0100
Subject: [PATCH] use QVector::fromStdVector instead of our own fct; rename
Utils files
---
App/AppOptions.cpp | 2 +-
App/main.cpp | 2 +-
GUI/Models/Fit/MinimizerItemCatalog.cpp | 2 +-
GUI/Models/Instrument/InstrumentItems.cpp | 2 +-
GUI/Models/Job/JobModel.cpp | 2 +-
GUI/Models/Job/JobModelFunctions.cpp | 2 +-
GUI/Models/Job/JobQueueData.cpp | 2 +-
GUI/Models/Material/MaterialItem.cpp | 2 +-
GUI/Models/Material/MaterialItemContainer.cpp | 2 +-
GUI/Models/Material/MaterialModel.cpp | 2 +-
GUI/Models/Project/ProjectDocument.cpp | 2 +-
GUI/Models/Session/SessionModel.cpp | 2 +-
GUI/Utils/ItemFileNameUtils.cpp | 2 +-
GUI/Utils/{Helpers.cpp => Path.cpp} | 21 +++++--------------
GUI/Utils/{Helpers.h => Path.h} | 10 ++++-----
GUI/Utils/{qstringutils.cpp => String.cpp} | 4 ++--
GUI/Utils/{qstringutils.h => String.h} | 8 +++----
GUI/Views/FitWidgets/FitObjectiveBuilder.cpp | 4 ++--
GUI/Views/FitWidgets/FitSessionController.cpp | 6 +++---
GUI/Views/Main/AboutDialog.cpp | 2 +-
GUI/Views/Main/ActionManager.cpp | 2 +-
GUI/Views/Main/MainWindow.cpp | 2 +-
GUI/Views/Main/PyImportAssistant.cpp | 2 +-
GUI/Views/Toplevel/ProjectSettingsView.cpp | 2 +-
GUI/Views/Toplevel/WelcomeView.cpp | 2 +-
GUI/Widgets/Info/ProjectLoadProblemDialog.cpp | 2 +-
Tests/Unit/GUI/TestHelpers.cpp | 2 +-
Tests/Unit/GUI/TestOutputDataIOService.cpp | 2 +-
Tests/Unit/GUI/TestProjectDocument.cpp | 2 +-
Tests/Unit/GUI/TestSaveService.cpp | 2 +-
30 files changed, 44 insertions(+), 57 deletions(-)
rename GUI/Utils/{Helpers.cpp => Path.cpp} (89%)
rename GUI/Utils/{Helpers.h => Path.h} (85%)
rename GUI/Utils/{qstringutils.cpp => String.cpp} (93%)
rename GUI/Utils/{qstringutils.h => String.h} (80%)
diff --git a/App/AppOptions.cpp b/App/AppOptions.cpp
index f11fc0bfe96..4ed664f39f4 100644
--- a/App/AppOptions.cpp
+++ b/App/AppOptions.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "App/AppOptions.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include <QSize>
#include <boost/program_options/config.hpp>
#include <boost/program_options/parsers.hpp>
diff --git a/App/main.cpp b/App/main.cpp
index 0583ce233ab..922c0968db6 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/State/SessionData.h"
#include "GUI/Views/Loaders/DataLoaderUtil.h"
#include "GUI/Views/Main/MainWindow.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include "GUI/Utils/hostosinfo.h"
#include "config_build.h"
#include <QDir>
diff --git a/GUI/Models/Fit/MinimizerItemCatalog.cpp b/GUI/Models/Fit/MinimizerItemCatalog.cpp
index 878552e93c9..c7af9a8b0a6 100644
--- a/GUI/Models/Fit/MinimizerItemCatalog.cpp
+++ b/GUI/Models/Fit/MinimizerItemCatalog.cpp
@@ -14,7 +14,7 @@
#include "GUI/Models/Fit/MinimizerItemCatalog.h"
#include "Fit/Kernel/MinimizerFactory.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
//! Returns ComboProperty representing list of algorithms defined for given minimizerType.
diff --git a/GUI/Models/Instrument/InstrumentItems.cpp b/GUI/Models/Instrument/InstrumentItems.cpp
index 4d2f20e21de..fee9fd783c7 100644
--- a/GUI/Models/Instrument/InstrumentItems.cpp
+++ b/GUI/Models/Instrument/InstrumentItems.cpp
@@ -33,7 +33,7 @@
#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Types/VectorItem.h"
#include "GUI/Utils/Error.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include "GUI/Utils/ItemFileNameUtils.h"
namespace {
diff --git a/GUI/Models/Job/JobModel.cpp b/GUI/Models/Job/JobModel.cpp
index 9e96a31dfe2..3cd58bbf202 100644
--- a/GUI/Models/Job/JobModel.cpp
+++ b/GUI/Models/Job/JobModel.cpp
@@ -24,7 +24,7 @@
#include "GUI/Models/Job/JobQueueData.h"
#include "GUI/Models/Job/ParameterTreeUtils.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
JobModel::JobModel(QObject* parent)
: SessionModel(GUI::Session::XML::JobModelTag, parent), m_queue_data(nullptr)
diff --git a/GUI/Models/Job/JobModelFunctions.cpp b/GUI/Models/Job/JobModelFunctions.cpp
index 52a0950aaa4..d8a629c954b 100644
--- a/GUI/Models/Job/JobModelFunctions.cpp
+++ b/GUI/Models/Job/JobModelFunctions.cpp
@@ -33,7 +33,7 @@
#include "GUI/Models/Sample/ItemWithMaterial.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Utils/Error.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include "GUI/Utils/ItemFileNameUtils.h"
#include <map>
diff --git a/GUI/Models/Job/JobQueueData.cpp b/GUI/Models/Job/JobQueueData.cpp
index a08f8f16a72..2a1be958975 100644
--- a/GUI/Models/Job/JobQueueData.cpp
+++ b/GUI/Models/Job/JobQueueData.cpp
@@ -19,7 +19,7 @@
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Models/Job/JobWorker.h"
#include "GUI/Utils/Error.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include <QThread>
namespace {
diff --git a/GUI/Models/Material/MaterialItem.cpp b/GUI/Models/Material/MaterialItem.cpp
index 925dddc9220..6fd5395cade 100644
--- a/GUI/Models/Material/MaterialItem.cpp
+++ b/GUI/Models/Material/MaterialItem.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/Group/GroupInfo.h"
#include "GUI/Models/Material/MaterialDataItems.h"
#include "GUI/Models/Types/VectorDescriptor.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include <QColor>
diff --git a/GUI/Models/Material/MaterialItemContainer.cpp b/GUI/Models/Material/MaterialItemContainer.cpp
index a7ef210aa03..cdf6b0ad512 100644
--- a/GUI/Models/Material/MaterialItemContainer.cpp
+++ b/GUI/Models/Material/MaterialItemContainer.cpp
@@ -15,7 +15,7 @@
#include "GUI/Models/Material/MaterialItemContainer.h"
#include "GUI/Models/Material/MaterialItem.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
MaterialItemContainer::MaterialItemContainer() : SessionItem(M_TYPE)
{
diff --git a/GUI/Models/Material/MaterialModel.cpp b/GUI/Models/Material/MaterialModel.cpp
index e25c8483c72..08f6cd0e66a 100644
--- a/GUI/Models/Material/MaterialModel.cpp
+++ b/GUI/Models/Material/MaterialModel.cpp
@@ -15,7 +15,7 @@
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Models/Material/MaterialModelStore.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
MaterialModel::MaterialModel(QObject* parent)
: SessionModel(GUI::Session::XML::MaterialModelTag, parent)
diff --git a/GUI/Models/Project/ProjectDocument.cpp b/GUI/Models/Project/ProjectDocument.cpp
index 8005b8ee86b..8a167dc8cb4 100644
--- a/GUI/Models/Project/ProjectDocument.cpp
+++ b/GUI/Models/Project/ProjectDocument.cpp
@@ -19,7 +19,7 @@
#include "GUI/Models/Project/OutputDataIOService.h"
#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Utils/Error.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include "GUI/Utils/MessageService.h"
#include <QDir>
#include <QElapsedTimer>
diff --git a/GUI/Models/Session/SessionModel.cpp b/GUI/Models/Session/SessionModel.cpp
index 83e1a672bed..b65927e25a3 100644
--- a/GUI/Models/Session/SessionModel.cpp
+++ b/GUI/Models/Session/SessionModel.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/Session/SessionItemTags.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Utils/Error.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include <QFile>
#include <QMimeData>
#include <QtCore/QXmlStreamWriter>
diff --git a/GUI/Utils/ItemFileNameUtils.cpp b/GUI/Utils/ItemFileNameUtils.cpp
index 5fa271ec5ab..7cb262ddaa9 100644
--- a/GUI/Utils/ItemFileNameUtils.cpp
+++ b/GUI/Utils/ItemFileNameUtils.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Utils/ItemFileNameUtils.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
namespace {
diff --git a/GUI/Utils/Helpers.cpp b/GUI/Utils/Path.cpp
similarity index 89%
rename from GUI/Utils/Helpers.cpp
rename to GUI/Utils/Path.cpp
index 45a29d4d6db..896dfed31ce 100644
--- a/GUI/Utils/Helpers.cpp
+++ b/GUI/Utils/Path.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Utils/Helpers.cpp
+//! @file GUI/Utils/Path.cpp
//! @brief Implements Helpers functions
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include "BAVersion.h"
#include <QDateTime>
#include <QDir>
@@ -57,9 +57,8 @@ QString getBornAgainVersionString()
QString getValidFileName(const QString& proposed_name)
{
QString result = proposed_name;
- for (auto it = invalidCharacterMap.begin(); it != invalidCharacterMap.end(); ++it) {
+ for (auto it = invalidCharacterMap.begin(); it != invalidCharacterMap.end(); ++it)
result.replace(it.key(), it.value());
- }
return result;
}
@@ -106,9 +105,8 @@ bool isVersionMatchMinimal(const QString& version, const QString& minimal_versio
QString fileDir(const QString& fileName)
{
QFileInfo info(fileName);
- if (info.exists()) {
+ if (info.exists())
return info.dir().path();
- }
return "";
}
@@ -120,20 +118,11 @@ QString baseName(const QString& fileName)
return info.baseName();
}
-QVector<double> fromStdVector(const std::vector<double>& data)
-{
- QVector<double> result;
- result.reserve(int(data.size()));
- std::copy(data.begin(), data.end(), std::back_inserter(result));
- return result;
-}
-
QStringList fromStdStrings(const std::vector<std::string>& container)
{
QStringList result;
- for (std::string str : container) {
+ for (std::string str : container)
result.append(QString::fromStdString(str));
- }
return result;
}
diff --git a/GUI/Utils/Helpers.h b/GUI/Utils/Path.h
similarity index 85%
rename from GUI/Utils/Helpers.h
rename to GUI/Utils/Path.h
index c979d422086..d940d35cdab 100644
--- a/GUI/Utils/Helpers.h
+++ b/GUI/Utils/Path.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Utils/Helpers.h
+//! @file GUI/Utils/Path.h
//! @brief Defines class Helpers functions
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_UTILS_HELPERS_H
-#define BORNAGAIN_GUI_UTILS_HELPERS_H
+#ifndef BORNAGAIN_GUI_UTILS_PATH_H
+#define BORNAGAIN_GUI_UTILS_PATH_H
#include <QStringList>
#include <ostream>
@@ -36,8 +36,6 @@ bool isVersionMatchMinimal(const QString& version, const QString& minimal_versio
QStringList fromStdStrings(const std::vector<std::string>& container);
-QVector<double> fromStdVector(const std::vector<double>& data);
-
QString createUuid();
} // namespace GUI::Helpers
@@ -48,4 +46,4 @@ inline std::ostream& operator<<(std::ostream& stream, const QString& str)
return stream;
}
-#endif // BORNAGAIN_GUI_UTILS_HELPERS_H
+#endif // BORNAGAIN_GUI_UTILS_PATH_H
diff --git a/GUI/Utils/qstringutils.cpp b/GUI/Utils/String.cpp
similarity index 93%
rename from GUI/Utils/qstringutils.cpp
rename to GUI/Utils/String.cpp
index 5ac70e56cef..4000054c83e 100644
--- a/GUI/Utils/qstringutils.cpp
+++ b/GUI/Utils/String.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Utils/qstringutils.cpp
+//! @file GUI/Utils/String.cpp
//! @brief Implements functions from Utils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Utils/qstringutils.h"
+#include "GUI/Utils/String.h"
#include "GUI/Utils/hostosinfo.h"
#include <QDir>
diff --git a/GUI/Utils/qstringutils.h b/GUI/Utils/String.h
similarity index 80%
rename from GUI/Utils/qstringutils.h
rename to GUI/Utils/String.h
index c7b596128d8..2f1f2f7da5e 100644
--- a/GUI/Utils/qstringutils.h
+++ b/GUI/Utils/String.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Utils/qstringutils.h
+//! @file GUI/Utils/String.h
//! @brief Defines functions from namespace GUI::Utils::String
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_UTILS_QSTRINGUTILS_H
-#define BORNAGAIN_GUI_UTILS_QSTRINGUTILS_H
+#ifndef BORNAGAIN_GUI_UTILS_STRING_H
+#define BORNAGAIN_GUI_UTILS_STRING_H
#include <QString>
@@ -23,4 +23,4 @@ QString withTildeHomePath(const QString& path);
} // namespace GUI::Utils::String
-#endif // BORNAGAIN_GUI_UTILS_QSTRINGUTILS_H
+#endif // BORNAGAIN_GUI_UTILS_STRING_H
diff --git a/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp b/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
index 7e0ea0a51ff..4449224f439 100644
--- a/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
+++ b/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
@@ -27,7 +27,7 @@
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Views/FitWidgets/GUIFitObserver.h"
#include "GUI/Utils/Error.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
FitObjectiveBuilder::FitObjectiveBuilder(JobItem* jobItem) : m_jobItem(jobItem)
{
@@ -126,7 +126,7 @@ std::unique_ptr<OutputData<double>> FitObjectiveBuilder::createOutputData() cons
void FitObjectiveBuilder::update_fit_parameters(const mumufit::Parameters& params) const
{
- QVector<double> values = GUI::Helpers::fromStdVector(params.values());
+ QVector<double> values = QVector<double>::fromStdVector(params.values());
auto fitParContainer = m_jobItem->fitParameterContainerItem();
fitParContainer->setValuesInParameterContainer(values, m_jobItem->parameterContainerItem());
diff --git a/GUI/Views/FitWidgets/FitSessionController.cpp b/GUI/Views/FitWidgets/FitSessionController.cpp
index c09bed5f963..51c175ce914 100644
--- a/GUI/Views/FitWidgets/FitSessionController.cpp
+++ b/GUI/Views/FitWidgets/FitSessionController.cpp
@@ -22,7 +22,7 @@
#include "GUI/Views/FitWidgets/FitWorkerLauncher.h"
#include "GUI/Views/FitWidgets/GUIFitObserver.h"
#include "GUI/Utils/Error.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
namespace {
const bool use_fit_objective = true;
@@ -164,7 +164,7 @@ void FitSessionController::updateIterationCount(const FitProgressInfo& info)
void FitSessionController::updateFitParameterValues(const FitProgressInfo& info)
{
- QVector<double> values = GUI::Helpers::fromStdVector(info.parValues());
+ QVector<double> values = QVector<double>::fromStdVector(info.parValues());
FitParameterContainerItem* fitParContainer = m_jobItem->fitParameterContainerItem();
fitParContainer->setValuesInParameterContainer(values, m_jobItem->parameterContainerItem());
}
@@ -174,7 +174,7 @@ void FitSessionController::updateLog(const FitProgressInfo& info)
QString message = QString("NCalls:%1 chi2:%2 \n").arg(info.iterationCount()).arg(info.chi2());
FitParameterContainerItem* fitParContainer = m_jobItem->fitParameterContainerItem();
int index(0);
- QVector<double> values = GUI::Helpers::fromStdVector(info.parValues());
+ QVector<double> values = QVector<double>::fromStdVector(info.parValues());
for (FitParameterItem* item : fitParContainer->fitParameterItems()) {
if (item->linkItems().empty())
continue;
diff --git a/GUI/Views/Main/AboutDialog.cpp b/GUI/Views/Main/AboutDialog.cpp
index 55cd6eeabdd..76a6cdf4424 100644
--- a/GUI/Views/Main/AboutDialog.cpp
+++ b/GUI/Views/Main/AboutDialog.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/Main/AboutDialog.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Utils/CustomEventFilters.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include <QDate>
#include <QLabel>
#include <QPushButton>
diff --git a/GUI/Views/Main/ActionManager.cpp b/GUI/Views/Main/ActionManager.cpp
index 713ca242c92..f573ebed890 100644
--- a/GUI/Views/Main/ActionManager.cpp
+++ b/GUI/Views/Main/ActionManager.cpp
@@ -25,7 +25,7 @@
#include "GUI/Views/Toplevel/SampleView.h"
#include "GUI/Utils/hostosinfo.h"
#include "GUI/Utils/mainwindow_constants.h"
-#include "GUI/Utils/qstringutils.h"
+#include "GUI/Utils/String.h"
#include <QDesktopServices>
#include <QDir>
#include <QMenuBar>
diff --git a/GUI/Views/Main/MainWindow.cpp b/GUI/Views/Main/MainWindow.cpp
index 11fb6350a3a..9a013d4bd5a 100644
--- a/GUI/Views/Main/MainWindow.cpp
+++ b/GUI/Views/Main/MainWindow.cpp
@@ -26,7 +26,7 @@
#include "GUI/Views/Toplevel/SessionModelView.h"
#include "GUI/Views/Toplevel/SimulationView.h"
#include "GUI/Views/Toplevel/WelcomeView.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include "GUI/Utils/hostosinfo.h"
#include "GUI/Utils/mainwindow_constants.h"
#include <QAction>
diff --git a/GUI/Views/Main/PyImportAssistant.cpp b/GUI/Views/Main/PyImportAssistant.cpp
index 088cd221276..23170c782aa 100644
--- a/GUI/Views/Main/PyImportAssistant.cpp
+++ b/GUI/Views/Main/PyImportAssistant.cpp
@@ -26,7 +26,7 @@
#include "GUI/Widgets/Info/ComboSelectorDialog.h"
#include "GUI/Widgets/Info/DetailedMessageBox.h"
#include "GUI/Utils/GUIHelpers.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Multilayer/PyImport.h"
#include <QApplication>
diff --git a/GUI/Views/Toplevel/ProjectSettingsView.cpp b/GUI/Views/Toplevel/ProjectSettingsView.cpp
index 18db990be59..29ac85336f4 100644
--- a/GUI/Views/Toplevel/ProjectSettingsView.cpp
+++ b/GUI/Views/Toplevel/ProjectSettingsView.cpp
@@ -19,7 +19,7 @@
#include "GUI/Models/Project/ProjectDocument.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
-#include "GUI/Utils/qstringutils.h"
+#include "GUI/Utils/String.h"
#include "ui_ProjectSettingsView.h"
#include <QDir>
#include <QMessageBox>
diff --git a/GUI/Views/Toplevel/WelcomeView.cpp b/GUI/Views/Toplevel/WelcomeView.cpp
index bc50160632c..346139dce35 100644
--- a/GUI/Views/Toplevel/WelcomeView.cpp
+++ b/GUI/Views/Toplevel/WelcomeView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Views/Main/ProjectManager.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Utils/LayoutUtils.h"
-#include "GUI/Utils/qstringutils.h"
+#include "GUI/Utils/String.h"
#include "ui_WelcomeView.h"
#include <QCommandLinkButton>
diff --git a/GUI/Widgets/Info/ProjectLoadProblemDialog.cpp b/GUI/Widgets/Info/ProjectLoadProblemDialog.cpp
index 81942bd1b90..1fd847c8a09 100644
--- a/GUI/Widgets/Info/ProjectLoadProblemDialog.cpp
+++ b/GUI/Widgets/Info/ProjectLoadProblemDialog.cpp
@@ -14,7 +14,7 @@
#include "GUI/Widgets/Info/ProjectLoadProblemDialog.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include <QBoxLayout>
#include <QGridLayout>
#include <QLabel>
diff --git a/Tests/Unit/GUI/TestHelpers.cpp b/Tests/Unit/GUI/TestHelpers.cpp
index f79f889e7f4..5b6c9b756ea 100644
--- a/Tests/Unit/GUI/TestHelpers.cpp
+++ b/Tests/Unit/GUI/TestHelpers.cpp
@@ -1,4 +1,4 @@
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include "Tests/GTestWrapper/google_test.h"
class TestHelpers : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index e6d3272af61..74487670788 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -12,7 +12,7 @@
#include "GUI/Models/Project/OutputDataIOService.h"
#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Utils/Error.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QTest>
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index 073c9fd86a9..d464a6cf706 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -7,7 +7,7 @@
#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Project/ProjectDocument.h"
#include "GUI/Models/Project/ProjectUtils.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QFileInfo>
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index cde1d026c21..80531569c2b 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -10,7 +10,7 @@
#include "GUI/Views/Main/AutosaveController.h"
#include "GUI/Views/Main/SaveService.h"
#include "GUI/Utils/Error.h"
-#include "GUI/Utils/Helpers.h"
+#include "GUI/Utils/Path.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QSignalSpy>
--
GitLab