diff --git a/App/main.cpp b/App/main.cpp index a4acd80dced7ecb27a1ca11de6b10de8c2dd346c..da08f2e2c09cefb089ed027c9828ab5d6e458471 100644 --- a/App/main.cpp +++ b/App/main.cpp @@ -17,7 +17,7 @@ #include "GUI/Application/GlobalSettings.h" #include "GUI/Model/State/SessionData.h" #include "GUI/Util/Path.h" -#include "GUI/Model/IO/hostosinfo.h" +#include "GUI/Util/hostosinfo.h" #include "GUI/View/Loaders/DataLoaderUtil.h" #include "GUI/View/Main/MainWindow.h" #include "config_build.h" diff --git a/GUI/Util/Path.cpp b/GUI/Util/Path.cpp index b63cd4e9502b5d1c5cab4ae00e06e7cdd22ba957..5047f48a814f86f64d13bead756990ea93057a84 100644 --- a/GUI/Util/Path.cpp +++ b/GUI/Util/Path.cpp @@ -14,7 +14,7 @@ #include "GUI/Util/Path.h" #include "BAVersion.h" -#include "GUI/Model/IO/hostosinfo.h" +#include "GUI/Util/hostosinfo.h" #include <QDateTime> #include <QDir> #include <QFileInfo> diff --git a/GUI/Util/String.cpp b/GUI/Util/String.cpp index 27726a74c25b4f9472b1c08f74a2b946a7452df2..1d76bea7ddd64e6b732f32382941800145b39308 100644 --- a/GUI/Util/String.cpp +++ b/GUI/Util/String.cpp @@ -13,7 +13,7 @@ // ************************************************************************************************ #include "GUI/Util/String.h" -#include "GUI/Model/IO/hostosinfo.h" +#include "GUI/Util/hostosinfo.h" #include <QDir> QStringList GUI::Util::String::fromStdStrings(const std::vector<std::string>& container) diff --git a/GUI/Model/IO/hostosinfo.h b/GUI/Util/hostosinfo.h similarity index 94% rename from GUI/Model/IO/hostosinfo.h rename to GUI/Util/hostosinfo.h index 5aa6857e0762615d364a8aae3b0148bea3538b2d..e49d0d10823b12e5af8edf3482224c9ec7400181 100644 --- a/GUI/Model/IO/hostosinfo.h +++ b/GUI/Util/hostosinfo.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/Model/IO/hostosinfo.h +//! @file GUI/Util/hostosinfo.h //! @brief Defines namespace GUI::Util::OS //! //! @homepage http://www.bornagainproject.org @@ -12,8 +12,8 @@ // // ************************************************************************************************ -#ifndef BORNAGAIN_GUI_MODEL_IO_HOSTOSINFO_H -#define BORNAGAIN_GUI_MODEL_IO_HOSTOSINFO_H +#ifndef BORNAGAIN_GUI_UTIL_HOSTOSINFO_H +#define BORNAGAIN_GUI_UTIL_HOSTOSINFO_H #include <QString> @@ -113,4 +113,4 @@ bool HostOsInfo::isAnyUnixHost() } // namespace GUI::Util::OS -#endif // BORNAGAIN_GUI_MODEL_IO_HOSTOSINFO_H +#endif // BORNAGAIN_GUI_UTIL_HOSTOSINFO_H diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp index 2e433fc3ffe979f1740efe73b11f5a0f6c10b970..62d00b0e315d3e655a23626ade66e1820c281c20 100644 --- a/GUI/View/Main/ActionManager.cpp +++ b/GUI/View/Main/ActionManager.cpp @@ -18,7 +18,7 @@ #include "GUI/Application/GlobalSettings.h" #include "GUI/Model/State/SessionData.h" #include "GUI/Util/Path.h" -#include "GUI/Model/IO/hostosinfo.h" +#include "GUI/Util/hostosinfo.h" #include "GUI/Util/mainwindow_constants.h" #include "GUI/View/JobWidgets/JobView.h" #include "GUI/View/Main/AboutDialog.h" diff --git a/GUI/View/Main/MainWindow.cpp b/GUI/View/Main/MainWindow.cpp index 4576223f849ad2b4eb9a3e9fb3928184effaa8b6..1295af14885f01a6c9758edbfc9f653510fa04d8 100644 --- a/GUI/View/Main/MainWindow.cpp +++ b/GUI/View/Main/MainWindow.cpp @@ -17,7 +17,7 @@ #include "GUI/Model/Job/JobModel.h" #include "GUI/Model/State/SessionData.h" #include "GUI/Util/Path.h" -#include "GUI/Model/IO/hostosinfo.h" +#include "GUI/Util/hostosinfo.h" #include "GUI/Util/mainwindow_constants.h" #include "GUI/View/InstrumentWidgets/InstrumentView.h" #include "GUI/View/JobWidgets/JobView.h" diff --git a/GUI/View/PropertyEditor/GroupInfoBox.cpp b/GUI/View/PropertyEditor/GroupInfoBox.cpp index 4cd47020e3e3a62bd9932ae6f2b6478c28d3b8fb..6763e2dd4bdd712a3d1ff70b03f46c81b3798fdc 100644 --- a/GUI/View/PropertyEditor/GroupInfoBox.cpp +++ b/GUI/View/PropertyEditor/GroupInfoBox.cpp @@ -13,7 +13,7 @@ // ************************************************************************************************ #include "GUI/View/PropertyEditor/GroupInfoBox.h" -#include "GUI/Model/IO/hostosinfo.h" +#include "GUI/Util/hostosinfo.h" #include <QApplication> #include <QMouseEvent> #include <QPainter> diff --git a/GUI/Widget/Common/StyleUtils.cpp b/GUI/Widget/Common/StyleUtils.cpp index fc52e0450ea289798dd49b9763fda740aeecab95..8ee5b649a8c5546fffa81e64e96874c86be69b59 100644 --- a/GUI/Widget/Common/StyleUtils.cpp +++ b/GUI/Widget/Common/StyleUtils.cpp @@ -14,7 +14,7 @@ #include "GUI/Widget/Common/StyleUtils.h" #include "Base/Utils/Assert.h" -#include "GUI/Model/IO/hostosinfo.h" +#include "GUI/Util/hostosinfo.h" #include "GUI/Widget/Common/DesignerHelper.h" #include "GUI/Widget/Common/detailswidget.h" #include <QApplication> diff --git a/GUI/Widget/Common/detailsbutton.cpp b/GUI/Widget/Common/detailsbutton.cpp index 1a00cc74184a1eeac38531a05a0ff40b1204d7dc..35049de301e666e363988bce23e2fc7f362ec4e5 100644 --- a/GUI/Widget/Common/detailsbutton.cpp +++ b/GUI/Widget/Common/detailsbutton.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ #include "GUI/Widget/Common/detailsbutton.h" -#include "GUI/Model/IO/hostosinfo.h" +#include "GUI/Util/hostosinfo.h" #include <QGraphicsOpacityEffect> #include <QPaintEvent> diff --git a/GUI/Widget/Common/detailswidget.cpp b/GUI/Widget/Common/detailswidget.cpp index 3b74ef6cfa0fc0be1dc2d1356c6334c3b11aaa8c..1460c594d8e784078b8e1d21fa4bb30726377aeb 100644 --- a/GUI/Widget/Common/detailswidget.cpp +++ b/GUI/Widget/Common/detailswidget.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ #include "GUI/Widget/Common/detailswidget.h" -#include "GUI/Model/IO/hostosinfo.h" +#include "GUI/Util/hostosinfo.h" #include "GUI/Widget/Common/detailsbutton.h" #include <QApplication>