diff --git a/App/AppOptions.cpp b/App/AppOptions.cpp index f11fc0bfe96967c6fa1a0a260786ed0ff2275ac3..4ed664f39f4120aade0176ed95387900177f7ee3 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 0583ce233ab2323cb758a5113574de6a6cde7f7a..922c0968db6d2ff1e060f589303c7792db9a58fa 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 878552e93c9302bc22ffe3d2ec376a75b411f714..c7af9a8b0a6e62848d8a18302ed741cced12c786 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 4d2f20e21debbefb4b469328bc09feea9d0e97b5..fee9fd783c7cb3b7f25d520780d40f697c86cbbf 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 9e96a31dfe2202dcb373efe82b454bdeffabc097..3cd58bbf2028287a30829c29c29b9deede75e850 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 52a0950aaa4ac93bea830eb27959dc17f2bb93d3..d8a629c954bdabed32ac889c4651c5ac5daefcb0 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 a08f8f16a7275da9cf45a7526af1f289d75159c5..2a1be9589759ae73cc0759585d31cf359aad82b6 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 925dddc92203342acc6448ec91c1c3b74850a925..6fd5395caded0e52bcc63aedc9c212402ffef9a8 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 a7ef210aa036a7b7a1f7cf72a58f7fe2f83d90fa..cdf6b0ad51259c7b755df4b5dab1d2ee1e4ee729 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 e25c8483c72e2c2b461347a1251001e25f60fc0b..08f6cd0e66a920a8984a6f10d51b20b9c35c94d0 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 8005b8ee86bdaebf78b700020c7f346b3ff951fd..8a167dc8cb44e3d5a5ae7af9d00419fdb545fac4 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 83e1a672bed064c08ffd585ee150b14f3467e762..b65927e25a3ee15a8638cbc0e3521b28e55d6a17 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 5fa271ec5ab58af2e1a5bf7c6b3b4c63799edd88..7cb262ddaa95aaef1ee23a7431c2899ad1b9edaf 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 45a29d4d6db7e71c5b89147e971c0abd27937095..896dfed31ced4376267613614a08def144132c1e 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 c979d42208606ca192b0c8f1d394f8fde49cf201..d940d35cdab21ca1d4773270cb07115cefe35c82 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 5ac70e56cef5b75dd64c186357a201bb9002faec..4000054c83e0631b9597c4e3e044c2dd8a90559e 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 c7b596128d890620c8f413300f1e530f2fc77e8c..2f1f2f7da5ed606bbeb5dde553f00fb3973a3d7f 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 7e0ea0a51ff4cfa389f29d3064fd679901b7e238..4449224f43903cbf8b78f6d8f3a47b62c0511594 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 c09bed5f963f2e7d4895e45402d803f06ffbef7e..51c175ce914f2ac194ea5c70bc73e882c585eacb 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 55cd6eeabdd6e6426856e8782d21dd7538c96945..76a6cdf4424791cfde7bdda006220959bca2f4da 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 713ca242c921d3a31c77dde7f05b756d1c9b82c1..f573ebed890e979ab95dff2851f7739daaf47047 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 11fb6350a3a9649bcbb3753346629a152c38a888..9a013d4bd5a5ef9bd19c236a0baa3dbcf6d10337 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 088cd221276be331ef699ea5add0aae116805e8b..23170c782aa3409e229c6987340c17c77c70dc06 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 18db990be59c98f04f112062ad5b6ac8449dcf11..29ac85336f47e12ae775b57b73eb4886c2286d7e 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 bc50160632c315241f37e61a30d6c4454bdaf135..346139dce35d1c8454d7e9be12beb68234891f9e 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 81942bd1b90273a8562e3d0a9174f59669d5adb4..1fd847c8a09b70f1a6c25ccaf632749178cc826c 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 f79f889e7f462a477653d2481ed98ade555b190c..5b6c9b756eac9aa821b5c3f0c5cfbc2c26f4ce3b 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 e6d3272af6112e4290134ced70a91b106f14407d..74487670788d288fdeaf8bafcf9e47b58d7c7508 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 073c9fd86a937219342048d24611075f236ad839..d464a6cf706ec541e5ba85bf4cecd628e7e780d8 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 cde1d026c21b269ef52f1509c20e07712a989024..80531569c2b58f0a5833bc540353a4924aaeb8fe 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>