diff --git a/GUI/Model/Data/ApplicationModels.h b/GUI/Model/Data/ApplicationModels.h
index 5f5ddebfd81814c8327b3686fdd872b89524d3b6..b910e969335dfb3c4d01c0aac58f9adab3dd6dc5 100644
--- a/GUI/Model/Data/ApplicationModels.h
+++ b/GUI/Model/Data/ApplicationModels.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_APPLICATIONMODELS_H
-#define BORNAGAIN_GUI_MODELS_DATA_APPLICATIONMODELS_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_APPLICATIONMODELS_H
+#define BORNAGAIN_GUI_MODEL_DATA_APPLICATIONMODELS_H
#include <QObject>
@@ -64,4 +64,4 @@ private:
JobModel* m_jobModel;
};
-#endif // BORNAGAIN_GUI_MODELS_DATA_APPLICATIONMODELS_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_APPLICATIONMODELS_H
diff --git a/GUI/Model/Data/AxesItems.h b/GUI/Model/Data/AxesItems.h
index 20e3d1f736b8d110429480e1dc95e6122f95d11b..10507ea393234b2ab7141419ca506142625cd3ef 100644
--- a/GUI/Model/Data/AxesItems.h
+++ b/GUI/Model/Data/AxesItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_AXESITEMS_H
-#define BORNAGAIN_GUI_MODELS_DATA_AXESITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_AXESITEMS_H
+#define BORNAGAIN_GUI_MODEL_DATA_AXESITEMS_H
#include "GUI/Model/Session/SessionItem.h"
#include <memory>
@@ -89,4 +89,4 @@ private:
void setMinMaxEditor(const QString& editorType);
};
-#endif // BORNAGAIN_GUI_MODELS_DATA_AXESITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_AXESITEMS_H
diff --git a/GUI/Model/Data/Data1DViewItem.h b/GUI/Model/Data/Data1DViewItem.h
index 4230ef528cad4dd023953deb282cf99e4605746c..9126912840d9bdeba50ad3320990e4ca253857dc 100644
--- a/GUI/Model/Data/Data1DViewItem.h
+++ b/GUI/Model/Data/Data1DViewItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_DATA1DVIEWITEM_H
-#define BORNAGAIN_GUI_MODELS_DATA_DATA1DVIEWITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_DATA1DVIEWITEM_H
+#define BORNAGAIN_GUI_MODEL_DATA_DATA1DVIEWITEM_H
#include "GUI/Model/Session/SessionItem.h"
@@ -105,4 +105,4 @@ private:
JobItem* m_job_item;
};
-#endif // BORNAGAIN_GUI_MODELS_DATA_DATA1DVIEWITEM_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_DATA1DVIEWITEM_H
diff --git a/GUI/Model/Data/DataItem.h b/GUI/Model/Data/DataItem.h
index 8de12daada61406ceaa87cb17995e275c1c4528a..bb73d4b2f69addd39ca1ac0acc0be2617e0cd907 100644
--- a/GUI/Model/Data/DataItem.h
+++ b/GUI/Model/Data/DataItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_DATAITEM_H
-#define BORNAGAIN_GUI_MODELS_DATA_DATAITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_DATAITEM_H
+#define BORNAGAIN_GUI_MODEL_DATA_DATAITEM_H
#include "Device/Data/OutputData.h"
#include "GUI/Model/Session/SessionItem.h"
@@ -79,4 +79,4 @@ protected:
std::mutex m_update_data_mutex;
};
-#endif // BORNAGAIN_GUI_MODELS_DATA_DATAITEM_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_DATAITEM_H
diff --git a/GUI/Model/Data/DataItemUtils.h b/GUI/Model/Data/DataItemUtils.h
index a09f0ca951a4b1a6b36ef102936a610982184112..61060eb0743044573a1d6f3560580f188612ce34 100644
--- a/GUI/Model/Data/DataItemUtils.h
+++ b/GUI/Model/Data/DataItemUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_DATAITEMUTILS_H
-#define BORNAGAIN_GUI_MODELS_DATA_DATAITEMUTILS_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_DATAITEMUTILS_H
+#define BORNAGAIN_GUI_MODEL_DATA_DATAITEMUTILS_H
class IntensityDataItem;
class SessionItem;
@@ -31,4 +31,4 @@ SpecularDataItem* specularDataItem(SessionItem* parent);
} // namespace GUI::Model::DataItemUtils
-#endif // BORNAGAIN_GUI_MODELS_DATA_DATAITEMUTILS_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_DATAITEMUTILS_H
diff --git a/GUI/Model/Data/DataProperties.h b/GUI/Model/Data/DataProperties.h
index 6e8264bd0184624cc73e8de2042423e9936dbbf4..acceccf9ae9ee6d8a7759c8fde206f7c4cb80f16 100644
--- a/GUI/Model/Data/DataProperties.h
+++ b/GUI/Model/Data/DataProperties.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_DATAPROPERTIES_H
-#define BORNAGAIN_GUI_MODELS_DATA_DATAPROPERTIES_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_DATAPROPERTIES_H
+#define BORNAGAIN_GUI_MODEL_DATA_DATAPROPERTIES_H
#include "GUI/Model/Session/SessionItem.h"
@@ -59,4 +59,4 @@ public:
static const QString& nextColorName(Data1DProperties* properties);
};
-#endif // BORNAGAIN_GUI_MODELS_DATA_DATAPROPERTIES_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_DATAPROPERTIES_H
diff --git a/GUI/Model/Data/DataPropertyContainer.h b/GUI/Model/Data/DataPropertyContainer.h
index b68443525d81550eee005963aa1f62d800fa6daa..2be645fa5877b56f391379f9cfe6dc4bb64aa362 100644
--- a/GUI/Model/Data/DataPropertyContainer.h
+++ b/GUI/Model/Data/DataPropertyContainer.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_DATAPROPERTYCONTAINER_H
-#define BORNAGAIN_GUI_MODELS_DATA_DATAPROPERTYCONTAINER_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_DATAPROPERTYCONTAINER_H
+#define BORNAGAIN_GUI_MODEL_DATA_DATAPROPERTYCONTAINER_H
#include "GUI/Model/Session/SessionItem.h"
@@ -43,4 +43,4 @@ protected:
DataItem* dataItem(size_t i) const;
};
-#endif // BORNAGAIN_GUI_MODELS_DATA_DATAPROPERTYCONTAINER_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_DATAPROPERTYCONTAINER_H
diff --git a/GUI/Model/Data/DataViewUtils.h b/GUI/Model/Data/DataViewUtils.h
index 071ef1a0d10792e10699bb86ace0b483448cf2b6..08b8346be5bbb3f9682ba62e0087cfec82dbc8ce 100644
--- a/GUI/Model/Data/DataViewUtils.h
+++ b/GUI/Model/Data/DataViewUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_DATAVIEWUTILS_H
-#define BORNAGAIN_GUI_MODELS_DATA_DATAVIEWUTILS_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_DATAVIEWUTILS_H
+#define BORNAGAIN_GUI_MODEL_DATA_DATAVIEWUTILS_H
#include <QString>
#include <memory>
@@ -30,4 +30,4 @@ std::unique_ptr<OutputData<double>> getTranslatedData(Data1DViewItem* view_item,
DataItem* data_item);
}; // namespace GUI::Model::DataViewUtils
-#endif // BORNAGAIN_GUI_MODELS_DATA_DATAVIEWUTILS_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_DATAVIEWUTILS_H
diff --git a/GUI/Model/Data/DocumentModel.h b/GUI/Model/Data/DocumentModel.h
index 97cc1ebbcfa5cf9fbe171ba5548b1675377791e8..c8b2afb0328a602d05bb12d688be2c0529a85372 100644
--- a/GUI/Model/Data/DocumentModel.h
+++ b/GUI/Model/Data/DocumentModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_DOCUMENTMODEL_H
-#define BORNAGAIN_GUI_MODELS_DATA_DOCUMENTMODEL_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_DOCUMENTMODEL_H
+#define BORNAGAIN_GUI_MODEL_DATA_DOCUMENTMODEL_H
#include "GUI/Model/Session/SessionModel.h"
@@ -31,4 +31,4 @@ public:
SimulationOptionsItem* simulationOptionsItem();
};
-#endif // BORNAGAIN_GUI_MODELS_DATA_DOCUMENTMODEL_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_DOCUMENTMODEL_H
diff --git a/GUI/Model/Data/ImportDataInfo.h b/GUI/Model/Data/ImportDataInfo.h
index 8031c598999c67b9070aaead8403a0d620dec503..1111a7bb3f31dec04ea8727f180e7f8709d6d4ac 100644
--- a/GUI/Model/Data/ImportDataInfo.h
+++ b/GUI/Model/Data/ImportDataInfo.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_IMPORTDATAINFO_H
-#define BORNAGAIN_GUI_MODELS_DATA_IMPORTDATAINFO_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_IMPORTDATAINFO_H
+#define BORNAGAIN_GUI_MODEL_DATA_IMPORTDATAINFO_H
#include "Device/Coord/Axes.h"
#include <QString>
@@ -51,4 +51,4 @@ private:
const Axes::Coords m_coords;
};
-#endif // BORNAGAIN_GUI_MODELS_DATA_IMPORTDATAINFO_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_IMPORTDATAINFO_H
diff --git a/GUI/Model/Data/IntensityDataItem.h b/GUI/Model/Data/IntensityDataItem.h
index cff59e98a493f6cd36d2331ef3dc630882217887..08f256990c12cd4ee14d83cfb46a27d0a69252e3 100644
--- a/GUI/Model/Data/IntensityDataItem.h
+++ b/GUI/Model/Data/IntensityDataItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_INTENSITYDATAITEM_H
-#define BORNAGAIN_GUI_MODELS_DATA_INTENSITYDATAITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_INTENSITYDATAITEM_H
+#define BORNAGAIN_GUI_MODEL_DATA_INTENSITYDATAITEM_H
#include "GUI/Model/Data/DataItem.h"
@@ -135,4 +135,4 @@ private:
void updateAxesLabels();
};
-#endif // BORNAGAIN_GUI_MODELS_DATA_INTENSITYDATAITEM_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_INTENSITYDATAITEM_H
diff --git a/GUI/Model/Data/MaskItems.h b/GUI/Model/Data/MaskItems.h
index 1063dcbcd239ed70efa2c6d5b506bb002964f649..1e145ac77634d37765d07272fe4d5870f5a8b1e6 100644
--- a/GUI/Model/Data/MaskItems.h
+++ b/GUI/Model/Data/MaskItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_MASKITEMS_H
-#define BORNAGAIN_GUI_MODELS_DATA_MASKITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_MASKITEMS_H
+#define BORNAGAIN_GUI_MODEL_DATA_MASKITEMS_H
#include "GUI/Model/Session/SessionItem.h"
@@ -188,4 +188,4 @@ public:
virtual std::unique_ptr<IShape2D> createShape(double scale) const override;
};
-#endif // BORNAGAIN_GUI_MODELS_DATA_MASKITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_MASKITEMS_H
diff --git a/GUI/Model/Data/MaskUnitsConverter.h b/GUI/Model/Data/MaskUnitsConverter.h
index 5d0bdaef2d113d21863e3cd5edfbd14daba5afad..6a177baf6078139f3be7a53955a99919a43c76eb 100644
--- a/GUI/Model/Data/MaskUnitsConverter.h
+++ b/GUI/Model/Data/MaskUnitsConverter.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_MASKUNITSCONVERTER_H
-#define BORNAGAIN_GUI_MODELS_DATA_MASKUNITSCONVERTER_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_MASKUNITSCONVERTER_H
+#define BORNAGAIN_GUI_MODEL_DATA_MASKUNITSCONVERTER_H
class IntensityDataItem;
class SessionItem;
@@ -51,4 +51,4 @@ private:
EConvertionDirection m_direction;
};
-#endif // BORNAGAIN_GUI_MODELS_DATA_MASKUNITSCONVERTER_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_MASKUNITSCONVERTER_H
diff --git a/GUI/Model/Data/PointwiseAxisItem.h b/GUI/Model/Data/PointwiseAxisItem.h
index 4b6fcdb05e917ddd0b4dc545566f9fd9caa6b467..32277a9bc88f143d838ac715ebf2232c5117cb0b 100644
--- a/GUI/Model/Data/PointwiseAxisItem.h
+++ b/GUI/Model/Data/PointwiseAxisItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_POINTWISEAXISITEM_H
-#define BORNAGAIN_GUI_MODELS_DATA_POINTWISEAXISITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_POINTWISEAXISITEM_H
+#define BORNAGAIN_GUI_MODEL_DATA_POINTWISEAXISITEM_H
#include "GUI/Model/Data/AxesItems.h"
#include "GUI/Model/IO/SaveLoadInterface.h"
@@ -63,4 +63,4 @@ private:
QDateTime m_last_modified;
};
-#endif // BORNAGAIN_GUI_MODELS_DATA_POINTWISEAXISITEM_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_POINTWISEAXISITEM_H
diff --git a/GUI/Model/Data/ProjectionItems.h b/GUI/Model/Data/ProjectionItems.h
index 9ce7220131518dc8d574c12617dafd2c073ae22b..37fbaa39a4974e524b30956a1a4e5a4f73a86df7 100644
--- a/GUI/Model/Data/ProjectionItems.h
+++ b/GUI/Model/Data/ProjectionItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_PROJECTIONITEMS_H
-#define BORNAGAIN_GUI_MODELS_DATA_PROJECTIONITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_PROJECTIONITEMS_H
+#define BORNAGAIN_GUI_MODEL_DATA_PROJECTIONITEMS_H
#include "GUI/Model/Session/SessionItem.h"
@@ -26,4 +26,4 @@ public:
ProjectionContainerItem();
};
-#endif // BORNAGAIN_GUI_MODELS_DATA_PROJECTIONITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_PROJECTIONITEMS_H
diff --git a/GUI/Model/Data/RealDataItem.h b/GUI/Model/Data/RealDataItem.h
index 5c9f0373a28667df0e064b5e1f26c305fd5ce2d5..c6f91b0efc240fd987a2422f001a5697f8c910b8 100644
--- a/GUI/Model/Data/RealDataItem.h
+++ b/GUI/Model/Data/RealDataItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_REALDATAITEM_H
-#define BORNAGAIN_GUI_MODELS_DATA_REALDATAITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_REALDATAITEM_H
+#define BORNAGAIN_GUI_MODEL_DATA_REALDATAITEM_H
#include "GUI/Model/IO/AbstractDataLoader.h"
#include "GUI/Model/Session/SessionItem.h"
@@ -127,4 +127,4 @@ private:
std::unique_ptr<AbstractDataLoader> m_dataLoader;
};
-#endif // BORNAGAIN_GUI_MODELS_DATA_REALDATAITEM_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_REALDATAITEM_H
diff --git a/GUI/Model/Data/RealDataModel.h b/GUI/Model/Data/RealDataModel.h
index 5549fc913055f11311e09d81b4759707eb962336..5374ab9d13fe8bd52c81e291e4601b40d305924d 100644
--- a/GUI/Model/Data/RealDataModel.h
+++ b/GUI/Model/Data/RealDataModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_REALDATAMODEL_H
-#define BORNAGAIN_GUI_MODELS_DATA_REALDATAMODEL_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_REALDATAMODEL_H
+#define BORNAGAIN_GUI_MODEL_DATA_REALDATAMODEL_H
#include "GUI/Model/Session/SessionModel.h"
@@ -51,4 +51,4 @@ private:
using SessionModel::removeRows; //< hiding this from usage - deprecated!
};
-#endif // BORNAGAIN_GUI_MODELS_DATA_REALDATAMODEL_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_REALDATAMODEL_H
diff --git a/GUI/Model/Data/SpecularDataItem.h b/GUI/Model/Data/SpecularDataItem.h
index 1b45fcf9f4f9e26ef0fa5b826b570a449489bcc2..e3defcd35b8b8c82bf01fe9c86e2904e48a7bc04 100644
--- a/GUI/Model/Data/SpecularDataItem.h
+++ b/GUI/Model/Data/SpecularDataItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DATA_SPECULARDATAITEM_H
-#define BORNAGAIN_GUI_MODELS_DATA_SPECULARDATAITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_SPECULARDATAITEM_H
+#define BORNAGAIN_GUI_MODEL_DATA_SPECULARDATAITEM_H
#include "GUI/Model/Data/DataItem.h"
@@ -89,4 +89,4 @@ private:
void updateAxesZoomLevel();
};
-#endif // BORNAGAIN_GUI_MODELS_DATA_SPECULARDATAITEM_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_SPECULARDATAITEM_H
diff --git a/GUI/Model/Domain/DomainObjectBuilder.h b/GUI/Model/Domain/DomainObjectBuilder.h
index 64076bd408ca010ecb4771c9624ffe80a4563689..43bbad2fca1cb9dfde7cf21ed7d3b3d908e89ab4 100644
--- a/GUI/Model/Domain/DomainObjectBuilder.h
+++ b/GUI/Model/Domain/DomainObjectBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DOMAIN_DOMAINOBJECTBUILDER_H
-#define BORNAGAIN_GUI_MODELS_DOMAIN_DOMAINOBJECTBUILDER_H
+#ifndef BORNAGAIN_GUI_MODEL_DOMAIN_DOMAINOBJECTBUILDER_H
+#define BORNAGAIN_GUI_MODEL_DOMAIN_DOMAINOBJECTBUILDER_H
#include <memory>
@@ -38,4 +38,4 @@ std::unique_ptr<IInterference> buildInterference(const SessionItem& item);
} // namespace GUI::Model::DomainObjectBuilder
-#endif // BORNAGAIN_GUI_MODELS_DOMAIN_DOMAINOBJECTBUILDER_H
+#endif // BORNAGAIN_GUI_MODEL_DOMAIN_DOMAINOBJECTBUILDER_H
diff --git a/GUI/Model/Domain/DomainSimulationBuilder.h b/GUI/Model/Domain/DomainSimulationBuilder.h
index dd79e78fc8fcc858f672e7ce64ac9e46f755e45a..30c20c07e56ab8af01c760f7fa7c1c2f5c976816 100644
--- a/GUI/Model/Domain/DomainSimulationBuilder.h
+++ b/GUI/Model/Domain/DomainSimulationBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DOMAIN_DOMAINSIMULATIONBUILDER_H
-#define BORNAGAIN_GUI_MODELS_DOMAIN_DOMAINSIMULATIONBUILDER_H
+#ifndef BORNAGAIN_GUI_MODEL_DOMAIN_DOMAINSIMULATIONBUILDER_H
+#define BORNAGAIN_GUI_MODEL_DOMAIN_DOMAINSIMULATIONBUILDER_H
#include <memory>
@@ -33,4 +33,4 @@ std::unique_ptr<ISimulation> createSimulation(const MultiLayerItem* sampleItem,
const SimulationOptionsItem* optionsItem = nullptr);
}; // namespace GUI::Model::DomainSimulationBuilder
-#endif // BORNAGAIN_GUI_MODELS_DOMAIN_DOMAINSIMULATIONBUILDER_H
+#endif // BORNAGAIN_GUI_MODEL_DOMAIN_DOMAINSIMULATIONBUILDER_H
diff --git a/GUI/Model/Domain/GUIObjectBuilder.h b/GUI/Model/Domain/GUIObjectBuilder.h
index 09b7ca693ae7dc9bdae4933cb65ff316f02ed867..ca03e936c5fa19c4a2c35a56387d9cb482a5c440 100644
--- a/GUI/Model/Domain/GUIObjectBuilder.h
+++ b/GUI/Model/Domain/GUIObjectBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DOMAIN_GUIOBJECTBUILDER_H
-#define BORNAGAIN_GUI_MODELS_DOMAIN_GUIOBJECTBUILDER_H
+#ifndef BORNAGAIN_GUI_MODEL_DOMAIN_GUIOBJECTBUILDER_H
+#define BORNAGAIN_GUI_MODEL_DOMAIN_GUIOBJECTBUILDER_H
#include <QString>
@@ -37,4 +37,4 @@ SessionItem* populateDocumentModel(DocumentModel* p_documentModel, const ISimula
} // namespace GUI::Model::ObjectBuilder
-#endif // BORNAGAIN_GUI_MODELS_DOMAIN_GUIOBJECTBUILDER_H
+#endif // BORNAGAIN_GUI_MODEL_DOMAIN_GUIOBJECTBUILDER_H
diff --git a/GUI/Model/Domain/TransformFromDomain.h b/GUI/Model/Domain/TransformFromDomain.h
index 19963fe5c3d7a29665d8d8cfa8fd90c21ad74272..50dfa6b401bbc2973f4cb658a67004ecff01b805 100644
--- a/GUI/Model/Domain/TransformFromDomain.h
+++ b/GUI/Model/Domain/TransformFromDomain.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DOMAIN_TRANSFORMFROMDOMAIN_H
-#define BORNAGAIN_GUI_MODELS_DOMAIN_TRANSFORMFROMDOMAIN_H
+#ifndef BORNAGAIN_GUI_MODEL_DOMAIN_TRANSFORMFROMDOMAIN_H
+#define BORNAGAIN_GUI_MODEL_DOMAIN_TRANSFORMFROMDOMAIN_H
#include <QString>
@@ -115,4 +115,4 @@ void setAxisItem(BasicAxisItem* item, const IAxis& axis, double factor = 1.0);
} // namespace GUI::Transform::FromDomain
-#endif // BORNAGAIN_GUI_MODELS_DOMAIN_TRANSFORMFROMDOMAIN_H
+#endif // BORNAGAIN_GUI_MODEL_DOMAIN_TRANSFORMFROMDOMAIN_H
diff --git a/GUI/Model/Fit/FitParameterHelper.h b/GUI/Model/Fit/FitParameterHelper.h
index 6138f8a0c4b1a5d25e886965cc1e2aacffa0a115..7709ca01f7375fb59eda22082a383d535e317e68 100644
--- a/GUI/Model/Fit/FitParameterHelper.h
+++ b/GUI/Model/Fit/FitParameterHelper.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_FIT_FITPARAMETERHELPER_H
-#define BORNAGAIN_GUI_MODELS_FIT_FITPARAMETERHELPER_H
+#ifndef BORNAGAIN_GUI_MODEL_FIT_FITPARAMETERHELPER_H
+#define BORNAGAIN_GUI_MODEL_FIT_FITPARAMETERHELPER_H
#include <QStringList>
@@ -40,4 +40,4 @@ ParameterItem* getParameterItem(FitParameterContainerItem* container, const QStr
}; // namespace FitParameterHelper
-#endif // BORNAGAIN_GUI_MODELS_FIT_FITPARAMETERHELPER_H
+#endif // BORNAGAIN_GUI_MODEL_FIT_FITPARAMETERHELPER_H
diff --git a/GUI/Model/Fit/FitParameterItems.h b/GUI/Model/Fit/FitParameterItems.h
index 8aaeb63dcd4720bf06fec487c9a7738d7003b4fd..87f6ab8500401e3d63c11f0ae9f955328f3bb686 100644
--- a/GUI/Model/Fit/FitParameterItems.h
+++ b/GUI/Model/Fit/FitParameterItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_FIT_FITPARAMETERITEMS_H
-#define BORNAGAIN_GUI_MODELS_FIT_FITPARAMETERITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_FIT_FITPARAMETERITEMS_H
+#define BORNAGAIN_GUI_MODEL_FIT_FITPARAMETERITEMS_H
#include "Fit/Param/AttLimits.h"
#include "GUI/Model/Session/SessionItem.h"
@@ -109,4 +109,4 @@ public:
mumufit::Parameters createParameters() const;
};
-#endif // BORNAGAIN_GUI_MODELS_FIT_FITPARAMETERITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_FIT_FITPARAMETERITEMS_H
diff --git a/GUI/Model/Fit/FitParameterProxyModel.h b/GUI/Model/Fit/FitParameterProxyModel.h
index a426d4da78591a73eb7e627fbd28a60d40c5d476..5f47ab1a4866c7b8bce1ef4d3ff0400b51b94364 100644
--- a/GUI/Model/Fit/FitParameterProxyModel.h
+++ b/GUI/Model/Fit/FitParameterProxyModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_FIT_FITPARAMETERPROXYMODEL_H
-#define BORNAGAIN_GUI_MODELS_FIT_FITPARAMETERPROXYMODEL_H
+#ifndef BORNAGAIN_GUI_MODEL_FIT_FITPARAMETERPROXYMODEL_H
+#define BORNAGAIN_GUI_MODEL_FIT_FITPARAMETERPROXYMODEL_H
#include <QAbstractItemModel>
#include <QStringList>
@@ -88,4 +88,4 @@ inline Qt::DropActions FitParameterProxyModel::supportedDropActions() const
return Qt::MoveAction | Qt::CopyAction;
}
-#endif // BORNAGAIN_GUI_MODELS_FIT_FITPARAMETERPROXYMODEL_H
+#endif // BORNAGAIN_GUI_MODEL_FIT_FITPARAMETERPROXYMODEL_H
diff --git a/GUI/Model/Fit/FitSuiteItem.h b/GUI/Model/Fit/FitSuiteItem.h
index 737d88401be2d9c34ae0aaa95fd26bc435d18179..ebd8f58ff127e28f05e7c5e9defee3bdea5a370a 100644
--- a/GUI/Model/Fit/FitSuiteItem.h
+++ b/GUI/Model/Fit/FitSuiteItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_FIT_FITSUITEITEM_H
-#define BORNAGAIN_GUI_MODELS_FIT_FITSUITEITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_FIT_FITSUITEITEM_H
+#define BORNAGAIN_GUI_MODEL_FIT_FITSUITEITEM_H
#include "GUI/Model/Session/SessionItem.h"
@@ -51,4 +51,4 @@ public:
void setChi2(double chi2);
};
-#endif // BORNAGAIN_GUI_MODELS_FIT_FITSUITEITEM_H
+#endif // BORNAGAIN_GUI_MODEL_FIT_FITSUITEITEM_H
diff --git a/GUI/Model/Fit/MinimizerItem.h b/GUI/Model/Fit/MinimizerItem.h
index 9f9bb92f4efb542b407c098df0cdb3a4fbb28fde..2c5b3483fb43638af30ed6a097b4978994a25bc1 100644
--- a/GUI/Model/Fit/MinimizerItem.h
+++ b/GUI/Model/Fit/MinimizerItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_FIT_MINIMIZERITEM_H
-#define BORNAGAIN_GUI_MODELS_FIT_MINIMIZERITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_FIT_MINIMIZERITEM_H
+#define BORNAGAIN_GUI_MODEL_FIT_MINIMIZERITEM_H
#include "GUI/Model/Session/SessionItem.h"
@@ -139,4 +139,4 @@ public:
std::unique_ptr<IMinimizer> createMinimizer() const;
};
-#endif // BORNAGAIN_GUI_MODELS_FIT_MINIMIZERITEM_H
+#endif // BORNAGAIN_GUI_MODEL_FIT_MINIMIZERITEM_H
diff --git a/GUI/Model/Fit/MinimizerItemCatalog.h b/GUI/Model/Fit/MinimizerItemCatalog.h
index 080436f50dbdc3756ab0e20c2302e281761a940c..c2ff0daadb0ecf6c48bb459a959c7fe982d82a46 100644
--- a/GUI/Model/Fit/MinimizerItemCatalog.h
+++ b/GUI/Model/Fit/MinimizerItemCatalog.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_FIT_MINIMIZERITEMCATALOG_H
-#define BORNAGAIN_GUI_MODELS_FIT_MINIMIZERITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_FIT_MINIMIZERITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_FIT_MINIMIZERITEMCATALOG_H
#include "GUI/Util/ComboProperty.h"
@@ -31,4 +31,4 @@ private:
static QStringList algorithmDescriptions(const QString& minimizerType);
};
-#endif // BORNAGAIN_GUI_MODELS_FIT_MINIMIZERITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_FIT_MINIMIZERITEMCATALOG_H
diff --git a/GUI/Model/Fit/ParameterTreeItems.h b/GUI/Model/Fit/ParameterTreeItems.h
index 93d0d9b793525236108238b45afcfe0e14760df9..f293defdd03b15a3d291c49f08cf58a1fd61c1bb 100644
--- a/GUI/Model/Fit/ParameterTreeItems.h
+++ b/GUI/Model/Fit/ParameterTreeItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_FIT_PARAMETERTREEITEMS_H
-#define BORNAGAIN_GUI_MODELS_FIT_PARAMETERTREEITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_FIT_PARAMETERTREEITEMS_H
+#define BORNAGAIN_GUI_MODEL_FIT_PARAMETERTREEITEMS_H
#include "GUI/Model/Session/SessionItem.h"
@@ -60,4 +60,4 @@ public:
ParameterContainerItem();
};
-#endif // BORNAGAIN_GUI_MODELS_FIT_PARAMETERTREEITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_FIT_PARAMETERTREEITEMS_H
diff --git a/GUI/Model/Fit/ParameterTuningModel.h b/GUI/Model/Fit/ParameterTuningModel.h
index 2595bd81993d600b89f40899c0e22201094c510c..d0375c46a4a15ce1e5c883dae5cb4f82108965fd 100644
--- a/GUI/Model/Fit/ParameterTuningModel.h
+++ b/GUI/Model/Fit/ParameterTuningModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_FIT_PARAMETERTUNINGMODEL_H
-#define BORNAGAIN_GUI_MODELS_FIT_PARAMETERTUNINGMODEL_H
+#ifndef BORNAGAIN_GUI_MODEL_FIT_PARAMETERTUNINGMODEL_H
+#define BORNAGAIN_GUI_MODEL_FIT_PARAMETERTUNINGMODEL_H
#include "GUI/Model/Group/FilterPropertyProxy.h"
@@ -49,4 +49,4 @@ inline Qt::DropActions ParameterTuningModel::supportedDropActions() const
return Qt::IgnoreAction;
}
-#endif // BORNAGAIN_GUI_MODELS_FIT_PARAMETERTUNINGMODEL_H
+#endif // BORNAGAIN_GUI_MODEL_FIT_PARAMETERTUNINGMODEL_H
diff --git a/GUI/Model/Group/DistributionItems.h b/GUI/Model/Group/DistributionItems.h
index d64b9f55d47ffcd9140321b419a6a564b38269dc..f846f9fb9fb201be29015ce9c2b4239764dfc69e 100644
--- a/GUI/Model/Group/DistributionItems.h
+++ b/GUI/Model/Group/DistributionItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_GROUP_DISTRIBUTIONITEMS_H
-#define BORNAGAIN_GUI_MODELS_GROUP_DISTRIBUTIONITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_GROUP_DISTRIBUTIONITEMS_H
+#define BORNAGAIN_GUI_MODEL_GROUP_DISTRIBUTIONITEMS_H
#include "GUI/Model/Session/SessionItem.h"
@@ -208,4 +208,4 @@ public:
void setRightWidth(double right_width);
};
-#endif // BORNAGAIN_GUI_MODELS_GROUP_DISTRIBUTIONITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_GROUP_DISTRIBUTIONITEMS_H
diff --git a/GUI/Model/Group/GroupInfo.h b/GUI/Model/Group/GroupInfo.h
index a34e147ddb861ef70572c906b457ad104a68130f..0657ef5b6effa6a9701e68558a890b296daad7ac 100644
--- a/GUI/Model/Group/GroupInfo.h
+++ b/GUI/Model/Group/GroupInfo.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_GROUP_GROUPINFO_H
-#define BORNAGAIN_GUI_MODELS_GROUP_GROUPINFO_H
+#ifndef BORNAGAIN_GUI_MODEL_GROUP_GROUPINFO_H
+#define BORNAGAIN_GUI_MODEL_GROUP_GROUPINFO_H
#include "GUI/Model/Group/ItemCatalog.h"
#include <QString>
@@ -67,4 +67,4 @@ private:
QVector<TypeAndLabel> m_info;
};
-#endif // BORNAGAIN_GUI_MODELS_GROUP_GROUPINFO_H
+#endif // BORNAGAIN_GUI_MODEL_GROUP_GROUPINFO_H
diff --git a/GUI/Model/Group/GroupItem.h b/GUI/Model/Group/GroupItem.h
index 902565f942baefd1d72dafe9aa024dc22500ee99..26a99685c454c530fda256cc1785f77d96731782 100644
--- a/GUI/Model/Group/GroupItem.h
+++ b/GUI/Model/Group/GroupItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_GROUP_GROUPITEM_H
-#define BORNAGAIN_GUI_MODELS_GROUP_GROUPITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_GROUP_GROUPITEM_H
+#define BORNAGAIN_GUI_MODEL_GROUP_GROUPITEM_H
#include "GUI/Model/Group/GroupItemController.h"
#include "GUI/Model/Session/SessionItem.h"
@@ -57,4 +57,4 @@ template <typename T> T* GroupItem::itemOfType() const
return dynamic_cast<T*>(m_controller->getItemOfType(T::M_TYPE));
}
-#endif // BORNAGAIN_GUI_MODELS_GROUP_GROUPITEM_H
+#endif // BORNAGAIN_GUI_MODEL_GROUP_GROUPITEM_H
diff --git a/GUI/Model/Group/GroupItemController.h b/GUI/Model/Group/GroupItemController.h
index db61c0dbaf349168bf25af9ab3c9bfca9c4c2e76..2d5faa963405b59c3499903e5d7223f148c73bc7 100644
--- a/GUI/Model/Group/GroupItemController.h
+++ b/GUI/Model/Group/GroupItemController.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_GROUP_GROUPITEMCONTROLLER_H
-#define BORNAGAIN_GUI_MODELS_GROUP_GROUPITEMCONTROLLER_H
+#ifndef BORNAGAIN_GUI_MODEL_GROUP_GROUPITEMCONTROLLER_H
+#define BORNAGAIN_GUI_MODEL_GROUP_GROUPITEMCONTROLLER_H
#include "GUI/Model/Group/GroupInfo.h"
#include <QStringList>
@@ -52,4 +52,4 @@ private:
GroupInfo m_groupInfo;
};
-#endif // BORNAGAIN_GUI_MODELS_GROUP_GROUPITEMCONTROLLER_H
+#endif // BORNAGAIN_GUI_MODEL_GROUP_GROUPITEMCONTROLLER_H
diff --git a/GUI/Model/Group/ItemCatalog.h b/GUI/Model/Group/ItemCatalog.h
index 6e2d125820620c392a3c66071ba066d1da8287a3..29923cbb78949b91a6592b9cc65d6614668460ee 100644
--- a/GUI/Model/Group/ItemCatalog.h
+++ b/GUI/Model/Group/ItemCatalog.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_GROUP_ITEMCATALOG_H
-#define BORNAGAIN_GUI_MODELS_GROUP_ITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_GROUP_ITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_GROUP_ITEMCATALOG_H
#include "Base/Utils/IFactory.h"
#include <QMap>
@@ -64,4 +64,4 @@ private:
};
-#endif // BORNAGAIN_GUI_MODELS_GROUP_ITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_GROUP_ITEMCATALOG_H
diff --git a/GUI/Model/Group/ItemFactory.h b/GUI/Model/Group/ItemFactory.h
index 2e57710e1df92d42d424841f1396651f67472186..a99c6a17b8d0b2cd0e9248563ec79e3914ee74fd 100644
--- a/GUI/Model/Group/ItemFactory.h
+++ b/GUI/Model/Group/ItemFactory.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_GROUP_ITEMFACTORY_H
-#define BORNAGAIN_GUI_MODELS_GROUP_ITEMFACTORY_H
+#ifndef BORNAGAIN_GUI_MODEL_GROUP_ITEMFACTORY_H
+#define BORNAGAIN_GUI_MODEL_GROUP_ITEMFACTORY_H
#include <QString>
@@ -39,4 +39,4 @@ template <typename ItemType> ItemType* CreateItem(SessionItem* parent)
}; // namespace GUI::Model::ItemFactory
-#endif // BORNAGAIN_GUI_MODELS_GROUP_ITEMFACTORY_H
+#endif // BORNAGAIN_GUI_MODEL_GROUP_ITEMFACTORY_H
diff --git a/GUI/Model/Group/SelectionDescriptor.h b/GUI/Model/Group/SelectionDescriptor.h
index 51a84cc05acfd19649bc509724812f49355342e7..54ac83313ae32bccf3d4046db4ce9bdc62996645 100644
--- a/GUI/Model/Group/SelectionDescriptor.h
+++ b/GUI/Model/Group/SelectionDescriptor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_GROUP_SELECTIONDESCRIPTOR_H
-#define BORNAGAIN_GUI_MODELS_GROUP_SELECTIONDESCRIPTOR_H
+#ifndef BORNAGAIN_GUI_MODEL_GROUP_SELECTIONDESCRIPTOR_H
+#define BORNAGAIN_GUI_MODEL_GROUP_SELECTIONDESCRIPTOR_H
#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Util/ComboProperty.h"
@@ -89,4 +89,4 @@ public:
function<T()> currentItem; //!< Function to get currently selected item
};
-#endif // BORNAGAIN_GUI_MODELS_GROUP_SELECTIONDESCRIPTOR_H
+#endif // BORNAGAIN_GUI_MODEL_GROUP_SELECTIONDESCRIPTOR_H
diff --git a/GUI/Model/Instrument/BackgroundItems.h b/GUI/Model/Instrument/BackgroundItems.h
index bd5ca13f958261d5fd7af7717692dbd2e28d96d1..1af041e96e578ebe480bc90f169d8fec0e54b7ad 100644
--- a/GUI/Model/Instrument/BackgroundItems.h
+++ b/GUI/Model/Instrument/BackgroundItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_BACKGROUNDITEMS_H
-#define BORNAGAIN_GUI_MODELS_INSTRUMENT_BACKGROUNDITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_INSTRUMENT_BACKGROUNDITEMS_H
+#define BORNAGAIN_GUI_MODEL_INSTRUMENT_BACKGROUNDITEMS_H
#include "GUI/Model/Session/SessionItem.h"
@@ -56,4 +56,4 @@ public:
std::unique_ptr<IBackground> createBackground() const;
};
-#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_BACKGROUNDITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_INSTRUMENT_BACKGROUNDITEMS_H
diff --git a/GUI/Model/Instrument/BeamAngleItems.h b/GUI/Model/Instrument/BeamAngleItems.h
index 0b5d9bc44889d26a73e98eaec6fc33ebc0324f30..a18cf25bfc35106cd487af6615e95bc4fcc84995 100644
--- a/GUI/Model/Instrument/BeamAngleItems.h
+++ b/GUI/Model/Instrument/BeamAngleItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMANGLEITEMS_H
-#define BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMANGLEITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_INSTRUMENT_BEAMANGLEITEMS_H
+#define BORNAGAIN_GUI_MODEL_INSTRUMENT_BEAMANGLEITEMS_H
#include "GUI/Model/Instrument/BeamDistributionItem.h"
@@ -45,4 +45,4 @@ private:
static const bool m_show_mean = true;
};
-#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMANGLEITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_INSTRUMENT_BEAMANGLEITEMS_H
diff --git a/GUI/Model/Instrument/BeamDistributionItem.h b/GUI/Model/Instrument/BeamDistributionItem.h
index a1a588d7e133ac00a6eee27a02f2c4ddc5ca1b4d..bab439b3a0268e9d8c9a39a82ef952a04b278bc3 100644
--- a/GUI/Model/Instrument/BeamDistributionItem.h
+++ b/GUI/Model/Instrument/BeamDistributionItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMDISTRIBUTIONITEM_H
-#define BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMDISTRIBUTIONITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_INSTRUMENT_BEAMDISTRIBUTIONITEM_H
+#define BORNAGAIN_GUI_MODEL_INSTRUMENT_BEAMDISTRIBUTIONITEM_H
#include "GUI/Model/Group/DistributionItems.h"
#include "GUI/Model/Types/ItemWithDistribution.h"
@@ -59,4 +59,4 @@ template <typename T> T* BeamDistributionItem::setDistributionType()
return setGroupPropertyType<T>(P_DISTRIBUTION);
}
-#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMDISTRIBUTIONITEM_H
+#endif // BORNAGAIN_GUI_MODEL_INSTRUMENT_BEAMDISTRIBUTIONITEM_H
diff --git a/GUI/Model/Instrument/BeamItems.h b/GUI/Model/Instrument/BeamItems.h
index ab6cc2516d0791fa02466cf63b06930f29a351a6..92b43a681e1e6543fdfb1cae6bf4e5ef182a845f 100644
--- a/GUI/Model/Instrument/BeamItems.h
+++ b/GUI/Model/Instrument/BeamItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMITEMS_H
-#define BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_INSTRUMENT_BEAMITEMS_H
+#define BORNAGAIN_GUI_MODEL_INSTRUMENT_BEAMITEMS_H
#include "Base/Vector/Vectors3D.h"
#include "GUI/Model/Instrument/SpecularBeamInclinationItem.h"
@@ -112,4 +112,4 @@ template <typename T> T* SpecularBeamItem::setFootprintType()
return setGroupPropertyType<T>(P_FOOTPRINT);
}
-#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_INSTRUMENT_BEAMITEMS_H
diff --git a/GUI/Model/Instrument/BeamWavelengthItem.h b/GUI/Model/Instrument/BeamWavelengthItem.h
index e0b1b4ac0e61a980242e332f885e8874150ad7f4..499c51137e552eb6e15d5a0fecc9a8c52d781553 100644
--- a/GUI/Model/Instrument/BeamWavelengthItem.h
+++ b/GUI/Model/Instrument/BeamWavelengthItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMWAVELENGTHITEM_H
-#define BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMWAVELENGTHITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_INSTRUMENT_BEAMWAVELENGTHITEM_H
+#define BORNAGAIN_GUI_MODEL_INSTRUMENT_BEAMWAVELENGTHITEM_H
#include "GUI/Model/Instrument/BeamDistributionItem.h"
@@ -39,4 +39,4 @@ public:
void setToRange(const RealLimits& limits);
};
-#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMWAVELENGTHITEM_H
+#endif // BORNAGAIN_GUI_MODEL_INSTRUMENT_BEAMWAVELENGTHITEM_H
diff --git a/GUI/Model/Instrument/DetectorItems.h b/GUI/Model/Instrument/DetectorItems.h
index 392c57cc9b23e0e52ea686a957ef942d820cfbca..7bf353ed1c3c07138a3eb402507915c1b1fe5079 100644
--- a/GUI/Model/Instrument/DetectorItems.h
+++ b/GUI/Model/Instrument/DetectorItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_DETECTORITEMS_H
-#define BORNAGAIN_GUI_MODELS_INSTRUMENT_DETECTORITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_INSTRUMENT_DETECTORITEMS_H
+#define BORNAGAIN_GUI_MODEL_INSTRUMENT_DETECTORITEMS_H
#include "Base/Vector/Vectors3D.h"
#include "GUI/Model/Session/SessionItem.h"
@@ -82,4 +82,4 @@ template <typename T> T* DetectorItem::setResolutionFunctionType()
return setGroupPropertyType<T>(P_RESOLUTION_FUNCTION);
}
-#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_DETECTORITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_INSTRUMENT_DETECTORITEMS_H
diff --git a/GUI/Model/Instrument/FootprintItems.h b/GUI/Model/Instrument/FootprintItems.h
index 45fedb0edfab08075e85381dd19f261873064048..0610f0170fc93a801dbf833c6397cf7b5db2aaf5 100644
--- a/GUI/Model/Instrument/FootprintItems.h
+++ b/GUI/Model/Instrument/FootprintItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_FOOTPRINTITEMS_H
-#define BORNAGAIN_GUI_MODELS_INSTRUMENT_FOOTPRINTITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_INSTRUMENT_FOOTPRINTITEMS_H
+#define BORNAGAIN_GUI_MODEL_INSTRUMENT_FOOTPRINTITEMS_H
#include "GUI/Model/Session/SessionItem.h"
@@ -65,4 +65,4 @@ public:
void setSquareFootprintValue(double value);
};
-#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_FOOTPRINTITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_INSTRUMENT_FOOTPRINTITEMS_H
diff --git a/GUI/Model/Instrument/InstrumentItems.h b/GUI/Model/Instrument/InstrumentItems.h
index 930d2b6ca796684de62897e8e75d6a2018a665be..48add155e12e9d446096db8e687f81c3a3e1cb46 100644
--- a/GUI/Model/Instrument/InstrumentItems.h
+++ b/GUI/Model/Instrument/InstrumentItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTITEMS_H
-#define BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_INSTRUMENT_INSTRUMENTITEMS_H
+#define BORNAGAIN_GUI_MODEL_INSTRUMENT_INSTRUMENTITEMS_H
#include "GUI/Model/Instrument/BeamItems.h" // inheritance prevents forward declaration
@@ -210,4 +210,4 @@ template <typename T> T* Instrument2DItem::setDetectorType()
return setGroupPropertyType<T>(P_DETECTOR);
}
-#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_INSTRUMENT_INSTRUMENTITEMS_H
diff --git a/GUI/Model/Instrument/InstrumentLibrary.h b/GUI/Model/Instrument/InstrumentLibrary.h
index c3946c5fb90f991d27cfb2f55779a3b56e0d78c1..d20bb567b7d131e1cdff1a38d523bd8f05ade170 100644
--- a/GUI/Model/Instrument/InstrumentLibrary.h
+++ b/GUI/Model/Instrument/InstrumentLibrary.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTLIBRARY_H
-#define BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTLIBRARY_H
+#ifndef BORNAGAIN_GUI_MODEL_INSTRUMENT_INSTRUMENTLIBRARY_H
+#define BORNAGAIN_GUI_MODEL_INSTRUMENT_INSTRUMENTLIBRARY_H
#include "GUI/Model/Instrument/InstrumentModel.h"
@@ -38,4 +38,4 @@ private:
bool m_modified;
};
-#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTLIBRARY_H
+#endif // BORNAGAIN_GUI_MODEL_INSTRUMENT_INSTRUMENTLIBRARY_H
diff --git a/GUI/Model/Instrument/InstrumentModel.h b/GUI/Model/Instrument/InstrumentModel.h
index c0aedc768974e0163420641833206cdc2e262277..79baea51066531a9fc6074fa7b0ea1133c2a606d 100644
--- a/GUI/Model/Instrument/InstrumentModel.h
+++ b/GUI/Model/Instrument/InstrumentModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTMODEL_H
-#define BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTMODEL_H
+#ifndef BORNAGAIN_GUI_MODEL_INSTRUMENT_INSTRUMENTMODEL_H
+#define BORNAGAIN_GUI_MODEL_INSTRUMENT_INSTRUMENTMODEL_H
#include "GUI/Model/Session/SessionModel.h"
#include <functional>
@@ -62,4 +62,4 @@ private:
void onInstrumentPropertyChange(const InstrumentItem* instrument, const QString& propertyName);
};
-#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTMODEL_H
+#endif // BORNAGAIN_GUI_MODEL_INSTRUMENT_INSTRUMENTMODEL_H
diff --git a/GUI/Model/Instrument/InstrumentsTreeModel.h b/GUI/Model/Instrument/InstrumentsTreeModel.h
index 830683b9a0de266b17af7d83e5205b0b04c34ee5..e481b23b64d5434b1fb480d2135e712611583858 100644
--- a/GUI/Model/Instrument/InstrumentsTreeModel.h
+++ b/GUI/Model/Instrument/InstrumentsTreeModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTSTREEMODEL_H
-#define BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTSTREEMODEL_H
+#ifndef BORNAGAIN_GUI_MODEL_INSTRUMENT_INSTRUMENTSTREEMODEL_H
+#define BORNAGAIN_GUI_MODEL_INSTRUMENT_INSTRUMENTSTREEMODEL_H
#include <QAbstractItemModel>
#include <QSet>
@@ -74,4 +74,4 @@ private:
bool m_enableEmptyHeadlines;
};
-#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTSTREEMODEL_H
+#endif // BORNAGAIN_GUI_MODEL_INSTRUMENT_INSTRUMENTSTREEMODEL_H
diff --git a/GUI/Model/Instrument/RectangularDetectorItem.h b/GUI/Model/Instrument/RectangularDetectorItem.h
index dd11aceb6cf987e2c03010d66bd2aa67040bb094..080f9ed1d9e35345b35b54dad8dabca728b9ae11 100644
--- a/GUI/Model/Instrument/RectangularDetectorItem.h
+++ b/GUI/Model/Instrument/RectangularDetectorItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_RECTANGULARDETECTORITEM_H
-#define BORNAGAIN_GUI_MODELS_INSTRUMENT_RECTANGULARDETECTORITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_INSTRUMENT_RECTANGULARDETECTORITEM_H
+#define BORNAGAIN_GUI_MODEL_INSTRUMENT_RECTANGULARDETECTORITEM_H
#include "GUI/Model/Instrument/DetectorItems.h"
@@ -91,4 +91,4 @@ private:
bool m_is_constructed;
};
-#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_RECTANGULARDETECTORITEM_H
+#endif // BORNAGAIN_GUI_MODEL_INSTRUMENT_RECTANGULARDETECTORITEM_H
diff --git a/GUI/Model/Instrument/SpecularBeamInclinationItem.h b/GUI/Model/Instrument/SpecularBeamInclinationItem.h
index b264f71d49b6b5d45a81ad49395d727974affa22..68818afc7634d5f86c80b5da53dd278aadf0d2bf 100644
--- a/GUI/Model/Instrument/SpecularBeamInclinationItem.h
+++ b/GUI/Model/Instrument/SpecularBeamInclinationItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_SPECULARBEAMINCLINATIONITEM_H
-#define BORNAGAIN_GUI_MODELS_INSTRUMENT_SPECULARBEAMINCLINATIONITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_INSTRUMENT_SPECULARBEAMINCLINATIONITEM_H
+#define BORNAGAIN_GUI_MODEL_INSTRUMENT_SPECULARBEAMINCLINATIONITEM_H
#include "GUI/Model/Instrument/BeamDistributionItem.h"
@@ -47,4 +47,4 @@ private:
static const bool m_show_mean = false;
};
-#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_SPECULARBEAMINCLINATIONITEM_H
+#endif // BORNAGAIN_GUI_MODEL_INSTRUMENT_SPECULARBEAMINCLINATIONITEM_H
diff --git a/GUI/Model/Instrument/SphericalDetectorItem.h b/GUI/Model/Instrument/SphericalDetectorItem.h
index ac75ab630047001a897aa9c97d4623d18d7b7611..c5f50bfa83ef05aba525d2281572741887da7826 100644
--- a/GUI/Model/Instrument/SphericalDetectorItem.h
+++ b/GUI/Model/Instrument/SphericalDetectorItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_SPHERICALDETECTORITEM_H
-#define BORNAGAIN_GUI_MODELS_INSTRUMENT_SPHERICALDETECTORITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_INSTRUMENT_SPHERICALDETECTORITEM_H
+#define BORNAGAIN_GUI_MODEL_INSTRUMENT_SPHERICALDETECTORITEM_H
#include "GUI/Model/Instrument/DetectorItems.h"
@@ -45,4 +45,4 @@ protected:
double axesToDomainUnitsFactor() const override;
};
-#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_SPHERICALDETECTORITEM_H
+#endif // BORNAGAIN_GUI_MODEL_INSTRUMENT_SPHERICALDETECTORITEM_H
diff --git a/GUI/Model/Job/JobItem.h b/GUI/Model/Job/JobItem.h
index 36c6fc1844b57973858f862c26bbbc5b8b07f5f9..ffdaedd0d7f05ac42bc57d15df2f2a83309d090c 100644
--- a/GUI/Model/Job/JobItem.h
+++ b/GUI/Model/Job/JobItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_JOB_JOBITEM_H
-#define BORNAGAIN_GUI_MODELS_JOB_JOBITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_JOB_JOBITEM_H
+#define BORNAGAIN_GUI_MODEL_JOB_JOBITEM_H
#include "GUI/Model/Job/JobStatus.h"
#include "GUI/Model/Session/SessionItem.h"
@@ -159,4 +159,4 @@ template <typename T> T* JobItem::setDataType()
return model()->insertItem<T>(this, -1, T_OUTPUT);
}
-#endif // BORNAGAIN_GUI_MODELS_JOB_JOBITEM_H
+#endif // BORNAGAIN_GUI_MODEL_JOB_JOBITEM_H
diff --git a/GUI/Model/Job/JobItemUtils.h b/GUI/Model/Job/JobItemUtils.h
index 65cd11b714f3199e81a98a8b737eeb5392abc6b9..417c1515a52b1b5d226e6ddfa7da4635d580d747 100644
--- a/GUI/Model/Job/JobItemUtils.h
+++ b/GUI/Model/Job/JobItemUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_JOB_JOBITEMUTILS_H
-#define BORNAGAIN_GUI_MODELS_JOB_JOBITEMUTILS_H
+#ifndef BORNAGAIN_GUI_MODEL_JOB_JOBITEMUTILS_H
+#define BORNAGAIN_GUI_MODEL_JOB_JOBITEMUTILS_H
#include "Device/Detector/IDetector.h"
#include "GUI/Util/ComboProperty.h"
@@ -53,4 +53,4 @@ ComboProperty availableUnits(const ICoordSystem& converter);
} // namespace GUI::Model::JobItemUtils
-#endif // BORNAGAIN_GUI_MODELS_JOB_JOBITEMUTILS_H
+#endif // BORNAGAIN_GUI_MODEL_JOB_JOBITEMUTILS_H
diff --git a/GUI/Model/Job/JobModel.h b/GUI/Model/Job/JobModel.h
index 9501f1fab528b6c1ab26721bc4a0620f419057e4..070e5f2e56c7f9e3b676be28adc28719245bce4d 100644
--- a/GUI/Model/Job/JobModel.h
+++ b/GUI/Model/Job/JobModel.h
@@ -11,8 +11,8 @@
//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_JOB_JOBMODEL_H
-#define BORNAGAIN_GUI_MODELS_JOB_JOBMODEL_H
+#ifndef BORNAGAIN_GUI_MODEL_JOB_JOBMODEL_H
+#define BORNAGAIN_GUI_MODEL_JOB_JOBMODEL_H
#include "GUI/Model/Session/SessionModel.h"
class JobQueueData;
@@ -64,4 +64,4 @@ private:
JobQueueData* m_queue_data;
};
-#endif // BORNAGAIN_GUI_MODELS_JOB_JOBMODEL_H
+#endif // BORNAGAIN_GUI_MODEL_JOB_JOBMODEL_H
diff --git a/GUI/Model/Job/JobModelFunctions.h b/GUI/Model/Job/JobModelFunctions.h
index 4df718a63461c918592430d2d36002ed425aca8b..8b62568cdd87e9f68abb71bd64fbf4d4f1a82d0f 100644
--- a/GUI/Model/Job/JobModelFunctions.h
+++ b/GUI/Model/Job/JobModelFunctions.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_JOB_JOBMODELFUNCTIONS_H
-#define BORNAGAIN_GUI_MODELS_JOB_JOBMODELFUNCTIONS_H
+#ifndef BORNAGAIN_GUI_MODEL_JOB_JOBMODELFUNCTIONS_H
+#define BORNAGAIN_GUI_MODEL_JOB_JOBMODELFUNCTIONS_H
class InstrumentItem;
class JobItem;
@@ -51,4 +51,4 @@ const JobItem* findJobItem(const SessionItem* item);
} // namespace GUI::Model::JobFunctions
-#endif // BORNAGAIN_GUI_MODELS_JOB_JOBMODELFUNCTIONS_H
+#endif // BORNAGAIN_GUI_MODEL_JOB_JOBMODELFUNCTIONS_H
diff --git a/GUI/Model/Job/JobQueueData.h b/GUI/Model/Job/JobQueueData.h
index 1dcdaff6f400e91beea45ab9a212f0e587de7505..881a096a72ff0803d7d648f61af13db72d5ca5cb 100644
--- a/GUI/Model/Job/JobQueueData.h
+++ b/GUI/Model/Job/JobQueueData.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_JOB_JOBQUEUEDATA_H
-#define BORNAGAIN_GUI_MODELS_JOB_JOBQUEUEDATA_H
+#ifndef BORNAGAIN_GUI_MODEL_JOB_JOBQUEUEDATA_H
+#define BORNAGAIN_GUI_MODEL_JOB_JOBQUEUEDATA_H
#include <QMap>
#include <QObject>
@@ -67,4 +67,4 @@ private:
JobModel* m_jobModel;
};
-#endif // BORNAGAIN_GUI_MODELS_JOB_JOBQUEUEDATA_H
+#endif // BORNAGAIN_GUI_MODEL_JOB_JOBQUEUEDATA_H
diff --git a/GUI/Model/Job/JobStatus.h b/GUI/Model/Job/JobStatus.h
index cb8dc9369a3ed420d823aaeac34428d0230dc90e..80fa5768d9e6779c688490952e08282acd0741ce 100644
--- a/GUI/Model/Job/JobStatus.h
+++ b/GUI/Model/Job/JobStatus.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_JOB_JOBSTATUS_H
-#define BORNAGAIN_GUI_MODELS_JOB_JOBSTATUS_H
+#ifndef BORNAGAIN_GUI_MODEL_JOB_JOBSTATUS_H
+#define BORNAGAIN_GUI_MODEL_JOB_JOBSTATUS_H
#include <QString>
@@ -34,4 +34,4 @@ const QString jobStatusToString(JobStatus status);
//! get status value for given string representation
JobStatus jobStatusFromString(const QString& name);
-#endif // BORNAGAIN_GUI_MODELS_JOB_JOBSTATUS_H
+#endif // BORNAGAIN_GUI_MODEL_JOB_JOBSTATUS_H
diff --git a/GUI/Model/Job/JobWorker.h b/GUI/Model/Job/JobWorker.h
index 4d0d8f091c113922e68cdb0927a48a354a93be2a..d293de018b82080c254d3420666c0c5e4b2dea80 100644
--- a/GUI/Model/Job/JobWorker.h
+++ b/GUI/Model/Job/JobWorker.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_JOB_JOBWORKER_H
-#define BORNAGAIN_GUI_MODELS_JOB_JOBWORKER_H
+#ifndef BORNAGAIN_GUI_MODEL_JOB_JOBWORKER_H
+#define BORNAGAIN_GUI_MODEL_JOB_JOBWORKER_H
#include "GUI/Model/Job/JobStatus.h"
#include <QDateTime>
@@ -61,4 +61,4 @@ private:
QDateTime m_simulation_end;
};
-#endif // BORNAGAIN_GUI_MODELS_JOB_JOBWORKER_H
+#endif // BORNAGAIN_GUI_MODEL_JOB_JOBWORKER_H
diff --git a/GUI/Model/Job/ParameterTreeUtils.h b/GUI/Model/Job/ParameterTreeUtils.h
index 17ce32c469dfe2b41b01be4c9c911d64e7c38581..6317d8d6555d7bda29cd142874c617e000066b12 100644
--- a/GUI/Model/Job/ParameterTreeUtils.h
+++ b/GUI/Model/Job/ParameterTreeUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_JOB_PARAMETERTREEUTILS_H
-#define BORNAGAIN_GUI_MODELS_JOB_PARAMETERTREEUTILS_H
+#ifndef BORNAGAIN_GUI_MODEL_JOB_PARAMETERTREEUTILS_H
+#define BORNAGAIN_GUI_MODEL_JOB_PARAMETERTREEUTILS_H
#include <QPair>
#include <QString>
@@ -33,4 +33,4 @@ void createParameterTree(JobItem* jobItem);
} // namespace GUI::Model::ParameterTreeUtils
-#endif // BORNAGAIN_GUI_MODELS_JOB_PARAMETERTREEUTILS_H
+#endif // BORNAGAIN_GUI_MODEL_JOB_PARAMETERTREEUTILS_H
diff --git a/GUI/Model/Material/MaterialDataItems.h b/GUI/Model/Material/MaterialDataItems.h
index 415307ab97751d932513072dbb4dcdd71be5f738..ea25e70dd7583d41a8f4d4e20589076ed3f44651 100644
--- a/GUI/Model/Material/MaterialDataItems.h
+++ b/GUI/Model/Material/MaterialDataItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALDATAITEMS_H
-#define BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALDATAITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALDATAITEMS_H
+#define BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALDATAITEMS_H
#include "GUI/Model/Session/SessionItem.h"
@@ -48,4 +48,4 @@ public:
friend class MaterialItem;
};
-#endif // BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALDATAITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALDATAITEMS_H
diff --git a/GUI/Model/Material/MaterialItem.h b/GUI/Model/Material/MaterialItem.h
index 3639e8be13f3d76a77ebb3afcfe6b477d4b95788..625407d2a5838e1243c1638ff362f812562cba93 100644
--- a/GUI/Model/Material/MaterialItem.h
+++ b/GUI/Model/Material/MaterialItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALITEM_H
-#define BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALITEM_H
+#define BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALITEM_H
#include "Base/Types/Complex.h"
#include "Base/Vector/Vectors3D.h"
@@ -73,4 +73,4 @@ public:
bool operator!=(const MaterialItem& other) const;
};
-#endif // BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALITEM_H
+#endif // BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALITEM_H
diff --git a/GUI/Model/Material/MaterialItemContainer.h b/GUI/Model/Material/MaterialItemContainer.h
index edbb5215ceafa8ef480e823fdd62f6cbdfe7f9b3..92e259775163c2c9e2b0ea5440f380bf13dbcbd1 100644
--- a/GUI/Model/Material/MaterialItemContainer.h
+++ b/GUI/Model/Material/MaterialItemContainer.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALITEMCONTAINER_H
-#define BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALITEMCONTAINER_H
+#ifndef BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALITEMCONTAINER_H
+#define BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALITEMCONTAINER_H
#include "GUI/Model/Session/SessionItem.h"
@@ -38,4 +38,4 @@ public:
QVector<MaterialItem*> getMaterials();
};
-#endif // BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALITEMCONTAINER_H
+#endif // BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALITEMCONTAINER_H
diff --git a/GUI/Model/Material/MaterialItemUtils.h b/GUI/Model/Material/MaterialItemUtils.h
index 45d74294358476a2c282fa03ba2bac2a5ff08a34..6e498c660e1156c3183f8199790296e2875a0b3b 100644
--- a/GUI/Model/Material/MaterialItemUtils.h
+++ b/GUI/Model/Material/MaterialItemUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALITEMUTILS_H
-#define BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALITEMUTILS_H
+#ifndef BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALITEMUTILS_H
+#define BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALITEMUTILS_H
#include <QColor>
#include <QString>
@@ -39,4 +39,4 @@ MaterialItem* findMaterial(const QString& materialIdentifier);
} // namespace GUI::MaterialUtil
-#endif // BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALITEMUTILS_H
+#endif // BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALITEMUTILS_H
diff --git a/GUI/Model/Material/MaterialModel.h b/GUI/Model/Material/MaterialModel.h
index a04486e73259c2eef426d9cecece6dc99e0be804..a88ce27b825510a41040cf2130cf47c546a0c837 100644
--- a/GUI/Model/Material/MaterialModel.h
+++ b/GUI/Model/Material/MaterialModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALMODEL_H
-#define BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALMODEL_H
+#ifndef BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALMODEL_H
+#define BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALMODEL_H
#include "GUI/Model/Session/SessionModel.h"
@@ -57,4 +57,4 @@ private:
void onRowsChange(const QModelIndex& parent, int, int);
};
-#endif // BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALMODEL_H
+#endif // BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALMODEL_H
diff --git a/GUI/Model/Material/MaterialModelStore.h b/GUI/Model/Material/MaterialModelStore.h
index 7380d3791eebcb6334d08821056e1e6c53d361a4..8af46ae41f99362baf7230ffc0f60b7fcd046f45 100644
--- a/GUI/Model/Material/MaterialModelStore.h
+++ b/GUI/Model/Material/MaterialModelStore.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALMODELSTORE_H
-#define BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALMODELSTORE_H
+#ifndef BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALMODELSTORE_H
+#define BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALMODELSTORE_H
class MaterialModel;
@@ -27,4 +27,4 @@ void unsubscribe(MaterialModel* materialModel);
} // namespace GUI::Model::MaterialModelStore
-#endif // BORNAGAIN_GUI_MODELS_MATERIAL_MATERIALMODELSTORE_H
+#endif // BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALMODELSTORE_H
diff --git a/GUI/Model/Project/OutputDataIOService.h b/GUI/Model/Project/OutputDataIOService.h
index a2959184659343eaa53bf2a1c2d34f35815e20e2..ac3ce190929499f7cd33dd504a45a230b8687cf3 100644
--- a/GUI/Model/Project/OutputDataIOService.h
+++ b/GUI/Model/Project/OutputDataIOService.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_PROJECT_OUTPUTDATAIOSERVICE_H
-#define BORNAGAIN_GUI_MODELS_PROJECT_OUTPUTDATAIOSERVICE_H
+#ifndef BORNAGAIN_GUI_MODEL_PROJECT_OUTPUTDATAIOSERVICE_H
+#define BORNAGAIN_GUI_MODEL_PROJECT_OUTPUTDATAIOSERVICE_H
#include "GUI/Model/IO/OutputDataIOHistory.h"
#include <QObject>
@@ -49,4 +49,4 @@ private:
ApplicationModels* m_applicationModels;
};
-#endif // BORNAGAIN_GUI_MODELS_PROJECT_OUTPUTDATAIOSERVICE_H
+#endif // BORNAGAIN_GUI_MODEL_PROJECT_OUTPUTDATAIOSERVICE_H
diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h
index bc9206a9a6a65e2c6a23ed41937137212e9a85c6..6c2380f34d296eb1c9396abd965ca72f0ec0cfbb 100644
--- a/GUI/Model/Project/ProjectDocument.h
+++ b/GUI/Model/Project/ProjectDocument.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_PROJECT_PROJECTDOCUMENT_H
-#define BORNAGAIN_GUI_MODELS_PROJECT_PROJECTDOCUMENT_H
+#ifndef BORNAGAIN_GUI_MODEL_PROJECT_PROJECTDOCUMENT_H
+#define BORNAGAIN_GUI_MODEL_PROJECT_PROJECTDOCUMENT_H
#include "GUI/Model/Data/ApplicationModels.h"
#include <QObject>
@@ -137,4 +137,4 @@ inline ProjectDocument::Functionalities toFunctionalities(const QVariant& v)
v.value<ProjectDocument::Functionalities::Int>());
}
-#endif // BORNAGAIN_GUI_MODELS_PROJECT_PROJECTDOCUMENT_H
+#endif // BORNAGAIN_GUI_MODEL_PROJECT_PROJECTDOCUMENT_H
diff --git a/GUI/Model/Sample/FTDecayFunctionItems.h b/GUI/Model/Sample/FTDecayFunctionItems.h
index 5f6352b0494c6f0cd75c28679dfbc305c66798cd..3aa44f818e61018f83a0587846e1278cf137e108 100644
--- a/GUI/Model/Sample/FTDecayFunctionItems.h
+++ b/GUI/Model/Sample/FTDecayFunctionItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_FTDECAYFUNCTIONITEMS_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_FTDECAYFUNCTIONITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_FTDECAYFUNCTIONITEMS_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_FTDECAYFUNCTIONITEMS_H
#include "GUI/Model/Session/SessionItem.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
@@ -131,4 +131,4 @@ public:
void setEta(double eta);
};
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_FTDECAYFUNCTIONITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_FTDECAYFUNCTIONITEMS_H
diff --git a/GUI/Model/Sample/FTDistributionItems.h b/GUI/Model/Sample/FTDistributionItems.h
index 1d5b03ff04cfc7b88d092b0b7b7637365e5a7db0..123ff7da4023af8440ad3551416c2e1523c42085 100644
--- a/GUI/Model/Sample/FTDistributionItems.h
+++ b/GUI/Model/Sample/FTDistributionItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_FTDISTRIBUTIONITEMS_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_FTDISTRIBUTIONITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_FTDISTRIBUTIONITEMS_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_FTDISTRIBUTIONITEMS_H
#include "GUI/Model/Session/SessionItem.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
@@ -162,4 +162,4 @@ public:
void setEta(double eta);
};
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_FTDISTRIBUTIONITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_FTDISTRIBUTIONITEMS_H
diff --git a/GUI/Model/Sample/FormFactorItems.h b/GUI/Model/Sample/FormFactorItems.h
index 13dfb408da2b45b09881cf78ac94a0900cd232e1..69840f57bcb3736f87c5131433eb484a8ec6b132 100644
--- a/GUI/Model/Sample/FormFactorItems.h
+++ b/GUI/Model/Sample/FormFactorItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_FORMFACTORITEMS_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_FORMFACTORITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_FORMFACTORITEMS_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_FORMFACTORITEMS_H
#include "GUI/Model/Session/SessionItem.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
@@ -702,4 +702,4 @@ public:
/// get a group info containing all form factors
GroupInfo formFactorGroupInfo();
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_FORMFACTORITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_FORMFACTORITEMS_H
diff --git a/GUI/Model/Sample/GUIDomainSampleVisitor.h b/GUI/Model/Sample/GUIDomainSampleVisitor.h
index 92ca4af8486f41896cb3a2715429be151d7d0336..8d1824eef291a81a846d76bc99e74b9844fbb5b4 100644
--- a/GUI/Model/Sample/GUIDomainSampleVisitor.h
+++ b/GUI/Model/Sample/GUIDomainSampleVisitor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_GUIDOMAINSAMPLEVISITOR_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_GUIDOMAINSAMPLEVISITOR_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_GUIDOMAINSAMPLEVISITOR_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_GUIDOMAINSAMPLEVISITOR_H
#include "Param/Node/INodeVisitor.h"
#include <QMap>
@@ -106,4 +106,4 @@ private:
MaterialModel* m_materialModel;
};
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_GUIDOMAINSAMPLEVISITOR_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_GUIDOMAINSAMPLEVISITOR_H
diff --git a/GUI/Model/Sample/GUIExamplesFactory.h b/GUI/Model/Sample/GUIExamplesFactory.h
index 13a43795fc98124a68fec61f63404f3447be7472..3536f1667ec6805f38b0b75c274fbce18ec4368a 100644
--- a/GUI/Model/Sample/GUIExamplesFactory.h
+++ b/GUI/Model/Sample/GUIExamplesFactory.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_GUIEXAMPLESFACTORY_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_GUIEXAMPLESFACTORY_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_GUIEXAMPLESFACTORY_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_GUIEXAMPLESFACTORY_H
#include <QString>
@@ -36,4 +36,4 @@ public:
static std::tuple<QString, QString> exampleInfo(const QString& name);
};
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_GUIEXAMPLESFACTORY_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_GUIEXAMPLESFACTORY_H
diff --git a/GUI/Model/Sample/InterferenceItems.h b/GUI/Model/Sample/InterferenceItems.h
index 3e0e959d80d135fc18688120a5f4d2df12db6c1e..2560eb90df6efc155d5c0de1655bb073d8d23ea6 100644
--- a/GUI/Model/Sample/InterferenceItems.h
+++ b/GUI/Model/Sample/InterferenceItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_INTERFERENCEITEMS_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_INTERFERENCEITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_INTERFERENCEITEMS_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_INTERFERENCEITEMS_H
#include "GUI/Model/Group/SelectionDescriptor.h"
#include "GUI/Model/Session/SessionGraphicsItem.h"
@@ -221,4 +221,4 @@ template <typename T> T* InterferenceRadialParaCrystalItem::setPDFType()
return setGroupPropertyType<T>(P_PDF);
}
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_INTERFERENCEITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_INTERFERENCEITEMS_H
diff --git a/GUI/Model/Sample/ItemWithMaterial.h b/GUI/Model/Sample/ItemWithMaterial.h
index 18054d9bf3cb0040a79e8c2acf8c78c75c3a3ac5..99b89c8be3ab11bb249c390a79e614790e3edcab 100644
--- a/GUI/Model/Sample/ItemWithMaterial.h
+++ b/GUI/Model/Sample/ItemWithMaterial.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_ITEMWITHMATERIAL_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_ITEMWITHMATERIAL_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHMATERIAL_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHMATERIAL_H
#include "GUI/Model/Session/SessionGraphicsItem.h"
#include <memory>
@@ -49,4 +49,4 @@ protected:
ItemWithMaterial(const QString& model_type);
};
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_ITEMWITHMATERIAL_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHMATERIAL_H
diff --git a/GUI/Model/Sample/ItemWithParticles.h b/GUI/Model/Sample/ItemWithParticles.h
index cf33a37be680b4e789515d60ea42dea1af014ae1..1de1dae42f6cc6a3299a89879098b82538514ae8 100644
--- a/GUI/Model/Sample/ItemWithParticles.h
+++ b/GUI/Model/Sample/ItemWithParticles.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_ITEMWITHPARTICLES_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_ITEMWITHPARTICLES_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHPARTICLES_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHPARTICLES_H
#include "Base/Vector/Vectors3D.h"
#include "GUI/Model/Group/SelectionDescriptor.h"
@@ -70,4 +70,4 @@ private:
RotationItem* rotationItem() const;
};
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_ITEMWITHPARTICLES_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_ITEMWITHPARTICLES_H
diff --git a/GUI/Model/Sample/Lattice2DItems.h b/GUI/Model/Sample/Lattice2DItems.h
index 1fdd863620368a1f630534b1a19cb675ea50da6f..127768b3dab479bf4dea6159c95f57a66e76b65f 100644
--- a/GUI/Model/Sample/Lattice2DItems.h
+++ b/GUI/Model/Sample/Lattice2DItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_LATTICE2DITEMS_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_LATTICE2DITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_LATTICE2DITEMS_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_LATTICE2DITEMS_H
#include "GUI/Model/Session/SessionItem.h"
class Lattice2D;
@@ -82,4 +82,4 @@ public:
void setLatticeLength(double length);
};
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_LATTICE2DITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_LATTICE2DITEMS_H
diff --git a/GUI/Model/Sample/LayerItem.h b/GUI/Model/Sample/LayerItem.h
index 2da1bc962535b8d4995d04355ab313581cb764c4..fca108f11d3c96aace9a5e7a9ce3c910c04845fe 100644
--- a/GUI/Model/Sample/LayerItem.h
+++ b/GUI/Model/Sample/LayerItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_LAYERITEM_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_LAYERITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_LAYERITEM_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_LAYERITEM_H
#include "GUI/Model/Group/SelectionDescriptor.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
@@ -78,4 +78,4 @@ template <typename T> T* LayerItem::setRoughnessType()
return setGroupPropertyType<T>(P_ROUGHNESS);
}
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_LAYERITEM_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_LAYERITEM_H
diff --git a/GUI/Model/Sample/LayerRoughnessItems.h b/GUI/Model/Sample/LayerRoughnessItems.h
index 3e391293e1862c5049887c0a8feb9c558b942746..cad52936ea98fcf5536603a96a9cd513b5df26a1 100644
--- a/GUI/Model/Sample/LayerRoughnessItems.h
+++ b/GUI/Model/Sample/LayerRoughnessItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_LAYERROUGHNESSITEMS_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_LAYERROUGHNESSITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_LAYERROUGHNESSITEMS_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_LAYERROUGHNESSITEMS_H
#include "GUI/Model/Session/SessionItem.h"
@@ -42,4 +42,4 @@ public:
DoubleDescriptor lateralCorrelationLength() const;
};
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_LAYERROUGHNESSITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_LAYERROUGHNESSITEMS_H
diff --git a/GUI/Model/Sample/MesoCrystalItem.h b/GUI/Model/Sample/MesoCrystalItem.h
index 67af48135fecd30596825776a41ee01a4408a155..36a8a6b95107a120ad014ec88ad7d5e217b6bdb6 100644
--- a/GUI/Model/Sample/MesoCrystalItem.h
+++ b/GUI/Model/Sample/MesoCrystalItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_MESOCRYSTALITEM_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_MESOCRYSTALITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_MESOCRYSTALITEM_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_MESOCRYSTALITEM_H
#include "Base/Vector/Vectors3D.h"
#include "GUI/Model/Sample/ItemWithParticles.h"
@@ -81,4 +81,4 @@ template <typename T> T* MesoCrystalItem::createBasis()
return model()->insertItem<T>(this, -1, T_BASIS_PARTICLE);
}
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_MESOCRYSTALITEM_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_MESOCRYSTALITEM_H
diff --git a/GUI/Model/Sample/MultiLayerItem.h b/GUI/Model/Sample/MultiLayerItem.h
index 7b6a9de59870e7edc7ef116e406c70cc778ce533..29dec2597ec0ad841833e709f78291f66608273f 100644
--- a/GUI/Model/Sample/MultiLayerItem.h
+++ b/GUI/Model/Sample/MultiLayerItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_MULTILAYERITEM_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_MULTILAYERITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_MULTILAYERITEM_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_MULTILAYERITEM_H
#include "Base/Vector/Vectors3D.h"
#include "GUI/Model/Session/SessionGraphicsItem.h"
@@ -63,4 +63,4 @@ private:
void updateLayers();
};
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_MULTILAYERITEM_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_MULTILAYERITEM_H
diff --git a/GUI/Model/Sample/ParticleCompositionItem.h b/GUI/Model/Sample/ParticleCompositionItem.h
index 4e5f2d676b891770155086682c9a397dec9ec362..d4f850f203cbdc4e1fa82840672c5a8f234c33ff 100644
--- a/GUI/Model/Sample/ParticleCompositionItem.h
+++ b/GUI/Model/Sample/ParticleCompositionItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLECOMPOSITIONITEM_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLECOMPOSITIONITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLECOMPOSITIONITEM_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLECOMPOSITIONITEM_H
#include "GUI/Model/Sample/ItemWithParticles.h"
#include "Sample/Particle/ParticleComposition.h"
@@ -36,4 +36,4 @@ public:
void removeParticle(ItemWithParticles* particle);
};
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLECOMPOSITIONITEM_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLECOMPOSITIONITEM_H
diff --git a/GUI/Model/Sample/ParticleCoreShellItem.h b/GUI/Model/Sample/ParticleCoreShellItem.h
index b075cf17cab17bfc3cdc4bb27869c4fd9ecdfdbe..713212b85e89edaa423e5fe6967b82578fc45bc6 100644
--- a/GUI/Model/Sample/ParticleCoreShellItem.h
+++ b/GUI/Model/Sample/ParticleCoreShellItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLECORESHELLITEM_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLECORESHELLITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLECORESHELLITEM_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLECORESHELLITEM_H
#include "GUI/Model/Sample/ItemWithParticles.h"
@@ -44,4 +44,4 @@ public:
static bool isShellTagName(const QString& name);
};
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLECORESHELLITEM_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLECORESHELLITEM_H
diff --git a/GUI/Model/Sample/ParticleItem.h b/GUI/Model/Sample/ParticleItem.h
index 38fec55a7da4af09d347108a35923ab49b864e47..a87a71aa2ba62ef67e0b5207f228b9ad111b3ecf 100644
--- a/GUI/Model/Sample/ParticleItem.h
+++ b/GUI/Model/Sample/ParticleItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLEITEM_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLEITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLEITEM_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLEITEM_H
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/ItemWithParticles.h"
@@ -53,4 +53,4 @@ template <typename T> T* ParticleItem::setFormFactorType()
return setGroupPropertyType<T>(P_FORM_FACTOR);
}
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLEITEM_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLEITEM_H
diff --git a/GUI/Model/Sample/ParticleLayoutItem.h b/GUI/Model/Sample/ParticleLayoutItem.h
index 5168d4592969d37a88feac30b08d619c07470029..896271fb5bfbd19b6a7ad0aa1203d6db821c8646 100644
--- a/GUI/Model/Sample/ParticleLayoutItem.h
+++ b/GUI/Model/Sample/ParticleLayoutItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLELAYOUTITEM_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLELAYOUTITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLELAYOUTITEM_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLELAYOUTITEM_H
#include "GUI/Model/Group/SelectionDescriptor.h"
#include "GUI/Model/Session/SessionGraphicsItem.h"
@@ -59,4 +59,4 @@ template <typename T> T* ParticleLayoutItem::createInterference()
return model()->insertItem<T>(this, -1, T_INTERFERENCE);
}
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLELAYOUTITEM_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLELAYOUTITEM_H
diff --git a/GUI/Model/Sample/SampleListModel.h b/GUI/Model/Sample/SampleListModel.h
index ce40b19d38f60080720472b64f22d7822ba19e2e..e5cdbce6812ae7a3de8def7bdcd2e04b2efbea4e 100644
--- a/GUI/Model/Sample/SampleListModel.h
+++ b/GUI/Model/Sample/SampleListModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_SAMPLELISTMODEL_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_SAMPLELISTMODEL_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_SAMPLELISTMODEL_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_SAMPLELISTMODEL_H
#include <QAbstractItemModel>
#include <QSet>
@@ -50,4 +50,4 @@ private:
SampleModel* m_sampleModel = nullptr;
};
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_SAMPLELISTMODEL_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_SAMPLELISTMODEL_H
diff --git a/GUI/Model/Sample/SampleModel.h b/GUI/Model/Sample/SampleModel.h
index e6e34dfc58d4657a27240a722b3dd2abdf71d099..88f773864bd6329171829d048cae20f4f61d3dd5 100644
--- a/GUI/Model/Sample/SampleModel.h
+++ b/GUI/Model/Sample/SampleModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_SAMPLEMODEL_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_SAMPLEMODEL_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_SAMPLEMODEL_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_SAMPLEMODEL_H
#include "GUI/Model/Session/SessionModel.h"
@@ -50,4 +50,4 @@ private:
void onDataChanged(const QModelIndex& index, const QModelIndex&);
};
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_SAMPLEMODEL_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_SAMPLEMODEL_H
diff --git a/GUI/Model/Sample/SampleValidator.h b/GUI/Model/Sample/SampleValidator.h
index ac147f71be3ada7fab2e16c9d50b478b492472cf..22e6491ddd9dbc4ebaea1c73f7d8237515ea53da 100644
--- a/GUI/Model/Sample/SampleValidator.h
+++ b/GUI/Model/Sample/SampleValidator.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_SAMPLEVALIDATOR_H
-#define BORNAGAIN_GUI_MODELS_SAMPLE_SAMPLEVALIDATOR_H
+#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_SAMPLEVALIDATOR_H
+#define BORNAGAIN_GUI_MODEL_SAMPLE_SAMPLEVALIDATOR_H
#include <QModelIndex>
@@ -47,4 +47,4 @@ private:
QString m_validation_message;
};
-#endif // BORNAGAIN_GUI_MODELS_SAMPLE_SAMPLEVALIDATOR_H
+#endif // BORNAGAIN_GUI_MODEL_SAMPLE_SAMPLEVALIDATOR_H
diff --git a/GUI/Model/Session/RealLimitsItems.h b/GUI/Model/Session/RealLimitsItems.h
index f9d51800a968583b01b721f5af8c0b9744c335e7..1283fb2ceec58290f0e07d4f6c758bb19412ab76 100644
--- a/GUI/Model/Session/RealLimitsItems.h
+++ b/GUI/Model/Session/RealLimitsItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SESSION_REALLIMITSITEMS_H
-#define BORNAGAIN_GUI_MODELS_SESSION_REALLIMITSITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_SESSION_REALLIMITSITEMS_H
+#define BORNAGAIN_GUI_MODEL_SESSION_REALLIMITSITEMS_H
#include <optional>
@@ -89,4 +89,4 @@ public:
using RealLimitsItem::setUpperLimit;
};
-#endif // BORNAGAIN_GUI_MODELS_SESSION_REALLIMITSITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_SESSION_REALLIMITSITEMS_H
diff --git a/GUI/Model/Session/SessionDecorationModel.h b/GUI/Model/Session/SessionDecorationModel.h
index 27115e9fc43b825f36dba6925a9ba8a57735ca97..ae8297fa573d25e519e19d85b202da80d1c2a98f 100644
--- a/GUI/Model/Session/SessionDecorationModel.h
+++ b/GUI/Model/Session/SessionDecorationModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SESSION_SESSIONDECORATIONMODEL_H
-#define BORNAGAIN_GUI_MODELS_SESSION_SESSIONDECORATIONMODEL_H
+#ifndef BORNAGAIN_GUI_MODEL_SESSION_SESSIONDECORATIONMODEL_H
+#define BORNAGAIN_GUI_MODEL_SESSION_SESSIONDECORATIONMODEL_H
#include <QIdentityProxyModel>
@@ -40,4 +40,4 @@ private:
SessionModel* m_model;
};
-#endif // BORNAGAIN_GUI_MODELS_SESSION_SESSIONDECORATIONMODEL_H
+#endif // BORNAGAIN_GUI_MODEL_SESSION_SESSIONDECORATIONMODEL_H
diff --git a/GUI/Model/Session/SessionFlags.h b/GUI/Model/Session/SessionFlags.h
index ce3f8a69f357ed2561a4bce4ff5e5a535baa39c4..fc2137df920a3990513520a5366e3a8f5e1ea551 100644
--- a/GUI/Model/Session/SessionFlags.h
+++ b/GUI/Model/Session/SessionFlags.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SESSION_SESSIONFLAGS_H
-#define BORNAGAIN_GUI_MODELS_SESSION_SESSIONFLAGS_H
+#ifndef BORNAGAIN_GUI_MODEL_SESSION_SESSIONFLAGS_H
+#define BORNAGAIN_GUI_MODEL_SESSION_SESSIONFLAGS_H
#include <qnamespace.h>
@@ -47,4 +47,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(SessionFlags::ModelColumn)
Q_DECLARE_OPERATORS_FOR_FLAGS(SessionFlags::ItemDataRole)
Q_DECLARE_OPERATORS_FOR_FLAGS(SessionFlags::ItemAppearance)
-#endif // BORNAGAIN_GUI_MODELS_SESSION_SESSIONFLAGS_H
+#endif // BORNAGAIN_GUI_MODEL_SESSION_SESSIONFLAGS_H
diff --git a/GUI/Model/Session/SessionGraphicsItem.h b/GUI/Model/Session/SessionGraphicsItem.h
index 15b902a46432c5eec58477743aa57f43bad0b801..28ce7cda63b655c494216799fdf21ff202974e00 100644
--- a/GUI/Model/Session/SessionGraphicsItem.h
+++ b/GUI/Model/Session/SessionGraphicsItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SESSION_SESSIONGRAPHICSITEM_H
-#define BORNAGAIN_GUI_MODELS_SESSION_SESSIONGRAPHICSITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_SESSION_SESSIONGRAPHICSITEM_H
+#define BORNAGAIN_GUI_MODEL_SESSION_SESSIONGRAPHICSITEM_H
#include "GUI/Model/Session/SessionItem.h"
@@ -36,4 +36,4 @@ protected:
explicit SessionGraphicsItem(const QString& model_type);
};
-#endif // BORNAGAIN_GUI_MODELS_SESSION_SESSIONGRAPHICSITEM_H
+#endif // BORNAGAIN_GUI_MODEL_SESSION_SESSIONGRAPHICSITEM_H
diff --git a/GUI/Model/Session/SessionItem.h b/GUI/Model/Session/SessionItem.h
index 79a9a28c187860eb2ba87e6c1216d48c86074176..c69672071539b9149109fd17579e4e2df7701023 100644
--- a/GUI/Model/Session/SessionItem.h
+++ b/GUI/Model/Session/SessionItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SESSION_SESSIONITEM_H
-#define BORNAGAIN_GUI_MODELS_SESSION_SESSIONITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_SESSION_SESSIONITEM_H
+#define BORNAGAIN_GUI_MODEL_SESSION_SESSIONITEM_H
#include "Base/Utils/Assert.h"
#include "Fit/Param/RealLimits.h"
@@ -423,4 +423,4 @@ template <typename T> bool SessionItem::hasModelType() const
return modelType() == T::M_TYPE;
}
-#endif // BORNAGAIN_GUI_MODELS_SESSION_SESSIONITEM_H
+#endif // BORNAGAIN_GUI_MODEL_SESSION_SESSIONITEM_H
diff --git a/GUI/Model/Session/SessionItemData.h b/GUI/Model/Session/SessionItemData.h
index a8d4b653557350dc05b3bbedaa4bac558d30d64e..b047ea37841e58b411763b9c794a420d77e6a2cd 100644
--- a/GUI/Model/Session/SessionItemData.h
+++ b/GUI/Model/Session/SessionItemData.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SESSION_SESSIONITEMDATA_H
-#define BORNAGAIN_GUI_MODELS_SESSION_SESSIONITEMDATA_H
+#ifndef BORNAGAIN_GUI_MODEL_SESSION_SESSIONITEMDATA_H
+#define BORNAGAIN_GUI_MODEL_SESSION_SESSIONITEMDATA_H
#include <QVariant>
#include <QVector>
@@ -40,4 +40,4 @@ private:
QVector<ItemData> m_values;
};
-#endif // BORNAGAIN_GUI_MODELS_SESSION_SESSIONITEMDATA_H
+#endif // BORNAGAIN_GUI_MODEL_SESSION_SESSIONITEMDATA_H
diff --git a/GUI/Model/Session/SessionItemTags.h b/GUI/Model/Session/SessionItemTags.h
index 78c25e33412cc4460b34ed6f31072d0685e0d37f..b10d6c1c3499735ad5e3d316efad6091261b65a2 100644
--- a/GUI/Model/Session/SessionItemTags.h
+++ b/GUI/Model/Session/SessionItemTags.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SESSION_SESSIONITEMTAGS_H
-#define BORNAGAIN_GUI_MODELS_SESSION_SESSIONITEMTAGS_H
+#ifndef BORNAGAIN_GUI_MODEL_SESSION_SESSIONITEMTAGS_H
+#define BORNAGAIN_GUI_MODEL_SESSION_SESSIONITEMTAGS_H
#include <QString>
#include <QStringList>
@@ -61,4 +61,4 @@ private:
QVector<TagInfo> m_tags;
};
-#endif // BORNAGAIN_GUI_MODELS_SESSION_SESSIONITEMTAGS_H
+#endif // BORNAGAIN_GUI_MODEL_SESSION_SESSIONITEMTAGS_H
diff --git a/GUI/Model/Session/SessionItemUtils.h b/GUI/Model/Session/SessionItemUtils.h
index 7ea1b61310b62dda054b7629c4bef5fb906ccc20..ceb523ca9a724dd39e70ec3355352dd03d846c99 100644
--- a/GUI/Model/Session/SessionItemUtils.h
+++ b/GUI/Model/Session/SessionItemUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SESSION_SESSIONITEMUTILS_H
-#define BORNAGAIN_GUI_MODELS_SESSION_SESSIONITEMUTILS_H
+#ifndef BORNAGAIN_GUI_MODEL_SESSION_SESSIONITEMUTILS_H
+#define BORNAGAIN_GUI_MODEL_SESSION_SESSIONITEMUTILS_H
#include "Base/Vector/Vectors3D.h"
#include <QString>
@@ -56,4 +56,4 @@ bool HasOwnAbundance(const SessionItem* item);
} // namespace GUI::Session::ItemUtils
-#endif // BORNAGAIN_GUI_MODELS_SESSION_SESSIONITEMUTILS_H
+#endif // BORNAGAIN_GUI_MODEL_SESSION_SESSIONITEMUTILS_H
diff --git a/GUI/Model/Session/SessionModel.h b/GUI/Model/Session/SessionModel.h
index a33cd5a3f23513b851430be98b2d3d06b39421a0..fcda02e72a6d72ba89f3c473ab25a1c114737ce0 100644
--- a/GUI/Model/Session/SessionModel.h
+++ b/GUI/Model/Session/SessionModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SESSION_SESSIONMODEL_H
-#define BORNAGAIN_GUI_MODELS_SESSION_SESSIONMODEL_H
+#ifndef BORNAGAIN_GUI_MODEL_SESSION_SESSIONMODEL_H
+#define BORNAGAIN_GUI_MODEL_SESSION_SESSIONMODEL_H
#include "GUI/Model/Session/SessionFlags.h"
#include "GUI/Model/Session/SessionItem.h"
@@ -217,4 +217,4 @@ inline void SessionModel::setDraggedItemType(const QString& type)
m_dragged_item_type = type;
}
-#endif // BORNAGAIN_GUI_MODELS_SESSION_SESSIONMODEL_H
+#endif // BORNAGAIN_GUI_MODEL_SESSION_SESSIONMODEL_H
diff --git a/GUI/Model/Session/SessionXML.h b/GUI/Model/Session/SessionXML.h
index 0b6280423a6e0cf5ffbe2d75a0b3a2ea66a52f90..776c4162f05662d812e9e8b71a72a4978ebdea0b 100644
--- a/GUI/Model/Session/SessionXML.h
+++ b/GUI/Model/Session/SessionXML.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SESSION_SESSIONXML_H
-#define BORNAGAIN_GUI_MODELS_SESSION_SESSIONXML_H
+#ifndef BORNAGAIN_GUI_MODEL_SESSION_SESSIONXML_H
+#define BORNAGAIN_GUI_MODEL_SESSION_SESSIONXML_H
#include <QVariant>
@@ -63,4 +63,4 @@ QString readProperty(QXmlStreamReader* reader, SessionItem* item,
} // namespace GUI::Session::XML
-#endif // BORNAGAIN_GUI_MODELS_SESSION_SESSIONXML_H
+#endif // BORNAGAIN_GUI_MODEL_SESSION_SESSIONXML_H
diff --git a/GUI/Model/Session/SimulationOptionsItem.h b/GUI/Model/Session/SimulationOptionsItem.h
index 1cc0d8d9af91259fab06f631dc90a022fa473fef..983351aca8e33a24a265cde7c5754f472afa90f8 100644
--- a/GUI/Model/Session/SimulationOptionsItem.h
+++ b/GUI/Model/Session/SimulationOptionsItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_SESSION_SIMULATIONOPTIONSITEM_H
-#define BORNAGAIN_GUI_MODELS_SESSION_SIMULATIONOPTIONSITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_SESSION_SIMULATIONOPTIONSITEM_H
+#define BORNAGAIN_GUI_MODEL_SESSION_SIMULATIONOPTIONSITEM_H
#include "GUI/Model/Session/SessionItem.h"
#include <QMap>
@@ -58,4 +58,4 @@ public:
bool includeSpecularPeak() const;
};
-#endif // BORNAGAIN_GUI_MODELS_SESSION_SIMULATIONOPTIONSITEM_H
+#endif // BORNAGAIN_GUI_MODEL_SESSION_SIMULATIONOPTIONSITEM_H
diff --git a/GUI/Model/State/SessionData.h b/GUI/Model/State/SessionData.h
index c6101b1e26afd1a81f0012564c63c6eebc58e005..240859f5e83daf165b3c0097917b038e29b9d405 100644
--- a/GUI/Model/State/SessionData.h
+++ b/GUI/Model/State/SessionData.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_STATE_SESSIONDATA_H
-#define BORNAGAIN_GUI_MODELS_STATE_SESSIONDATA_H
+#ifndef BORNAGAIN_GUI_MODEL_STATE_SESSIONDATA_H
+#define BORNAGAIN_GUI_MODEL_STATE_SESSIONDATA_H
#include "GUI/Model/Instrument/InstrumentLibrary.h"
#include "GUI/Model/Project/ProjectDocument.h"
@@ -32,4 +32,4 @@ struct SessionData {
extern SessionData* gSessionData; //!< global pointer to the single instance
-#endif // BORNAGAIN_GUI_MODELS_STATE_SESSIONDATA_H
+#endif // BORNAGAIN_GUI_MODEL_STATE_SESSIONDATA_H
diff --git a/GUI/Model/Trafo/RotationItems.h b/GUI/Model/Trafo/RotationItems.h
index 42ccdb5733d42563f53df241fca518867b513c6e..6256ec6302fd7ca775228138168d23c3fc65396a 100644
--- a/GUI/Model/Trafo/RotationItems.h
+++ b/GUI/Model/Trafo/RotationItems.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_TRAFO_ROTATIONITEMS_H
-#define BORNAGAIN_GUI_MODELS_TRAFO_ROTATIONITEMS_H
+#ifndef BORNAGAIN_GUI_MODEL_TRAFO_ROTATIONITEMS_H
+#define BORNAGAIN_GUI_MODEL_TRAFO_ROTATIONITEMS_H
#include "GUI/Model/Session/SessionItem.h"
@@ -92,4 +92,4 @@ protected:
virtual unique_ptr<IRotation> createRotation() const override;
};
-#endif // BORNAGAIN_GUI_MODELS_TRAFO_ROTATIONITEMS_H
+#endif // BORNAGAIN_GUI_MODEL_TRAFO_ROTATIONITEMS_H
diff --git a/GUI/Model/Trafo/TransformationItem.h b/GUI/Model/Trafo/TransformationItem.h
index 874eaa85e5be1e2fc3050d694877a10176fca9e1..bb35832943f004c6d07ca226a56a4aaa9d2ac02b 100644
--- a/GUI/Model/Trafo/TransformationItem.h
+++ b/GUI/Model/Trafo/TransformationItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_TRAFO_TRANSFORMATIONITEM_H
-#define BORNAGAIN_GUI_MODELS_TRAFO_TRANSFORMATIONITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_TRAFO_TRANSFORMATIONITEM_H
+#define BORNAGAIN_GUI_MODEL_TRAFO_TRANSFORMATIONITEM_H
#include "GUI/Model/Session/SessionGraphicsItem.h"
@@ -42,4 +42,4 @@ template <typename T> T* TransformationItem::setRotationType()
return setGroupPropertyType<T>(P_ROT);
}
-#endif // BORNAGAIN_GUI_MODELS_TRAFO_TRANSFORMATIONITEM_H
+#endif // BORNAGAIN_GUI_MODEL_TRAFO_TRANSFORMATIONITEM_H
diff --git a/GUI/Model/Types/DoubleDescriptor.h b/GUI/Model/Types/DoubleDescriptor.h
index f28f4499d642775116c24dcc97b9c05c5b10a5c8..690daf387504d4574eba7132d6d8c67f75a3b78d 100644
--- a/GUI/Model/Types/DoubleDescriptor.h
+++ b/GUI/Model/Types/DoubleDescriptor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_TYPES_DOUBLEDESCRIPTOR_H
-#define BORNAGAIN_GUI_MODELS_TYPES_DOUBLEDESCRIPTOR_H
+#ifndef BORNAGAIN_GUI_MODEL_TYPES_DOUBLEDESCRIPTOR_H
+#define BORNAGAIN_GUI_MODEL_TYPES_DOUBLEDESCRIPTOR_H
#include "Fit/Param/RealLimits.h"
#include "GUI/Model/Types/Unit.h"
@@ -83,4 +83,4 @@ public:
using DoubleDescriptors = QList<DoubleDescriptor>;
-#endif // BORNAGAIN_GUI_MODELS_TYPES_DOUBLEDESCRIPTOR_H
+#endif // BORNAGAIN_GUI_MODEL_TYPES_DOUBLEDESCRIPTOR_H
diff --git a/GUI/Model/Types/ItemWithDistribution.h b/GUI/Model/Types/ItemWithDistribution.h
index edd45ce44063b83bb95575f6c2d54e29c56ac8b8..cd9acbd97a68259e0c9a048516db5380da548381 100644
--- a/GUI/Model/Types/ItemWithDistribution.h
+++ b/GUI/Model/Types/ItemWithDistribution.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_TYPES_ITEMWITHDISTRIBUTION_H
-#define BORNAGAIN_GUI_MODELS_TYPES_ITEMWITHDISTRIBUTION_H
+#ifndef BORNAGAIN_GUI_MODEL_TYPES_ITEMWITHDISTRIBUTION_H
+#define BORNAGAIN_GUI_MODEL_TYPES_ITEMWITHDISTRIBUTION_H
#include "Wrap/WinDllMacros.h"
@@ -33,4 +33,4 @@ public:
virtual ~ItemWithDistribution() = default;
};
-#endif // BORNAGAIN_GUI_MODELS_TYPES_ITEMWITHDISTRIBUTION_H
+#endif // BORNAGAIN_GUI_MODEL_TYPES_ITEMWITHDISTRIBUTION_H
diff --git a/GUI/Model/Types/UIntDescriptor.h b/GUI/Model/Types/UIntDescriptor.h
index 6ff3a5d6a567156aaf4e7660f44865c453d1c309..5f1ea7560e4b9e7931ab5f9b274aea2671c9b9a3 100644
--- a/GUI/Model/Types/UIntDescriptor.h
+++ b/GUI/Model/Types/UIntDescriptor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_TYPES_UINTDESCRIPTOR_H
-#define BORNAGAIN_GUI_MODELS_TYPES_UINTDESCRIPTOR_H
+#ifndef BORNAGAIN_GUI_MODEL_TYPES_UINTDESCRIPTOR_H
+#define BORNAGAIN_GUI_MODEL_TYPES_UINTDESCRIPTOR_H
#include "Fit/Param/RealLimits.h"
#include "GUI/Model/Types/Unit.h"
@@ -69,4 +69,4 @@ public:
function<QString()> path = nullptr; //<! Path describing this value. Used e.g. for undo/redo
};
-#endif // BORNAGAIN_GUI_MODELS_TYPES_UINTDESCRIPTOR_H
+#endif // BORNAGAIN_GUI_MODEL_TYPES_UINTDESCRIPTOR_H
diff --git a/GUI/Model/Types/VectorDescriptor.h b/GUI/Model/Types/VectorDescriptor.h
index d8e0b164d05aea02bffebfa543f75cd584a41c0c..46eb6b17ba21f61e133e9d4d286c52697857a4f7 100644
--- a/GUI/Model/Types/VectorDescriptor.h
+++ b/GUI/Model/Types/VectorDescriptor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_TYPES_VECTORDESCRIPTOR_H
-#define BORNAGAIN_GUI_MODELS_TYPES_VECTORDESCRIPTOR_H
+#ifndef BORNAGAIN_GUI_MODEL_TYPES_VECTORDESCRIPTOR_H
+#define BORNAGAIN_GUI_MODEL_TYPES_VECTORDESCRIPTOR_H
#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Model/Types/VectorItem.h"
@@ -45,4 +45,4 @@ public:
DoubleDescriptor z;
};
-#endif // BORNAGAIN_GUI_MODELS_TYPES_VECTORDESCRIPTOR_H
+#endif // BORNAGAIN_GUI_MODEL_TYPES_VECTORDESCRIPTOR_H
diff --git a/GUI/Model/Types/VectorItem.h b/GUI/Model/Types/VectorItem.h
index c6aaff63a0b32e923183e4c4126a81a23abacc29..5ee7bff29eca11c2dbed5acad645a2ea1a7f5392 100644
--- a/GUI/Model/Types/VectorItem.h
+++ b/GUI/Model/Types/VectorItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_TYPES_VECTORITEM_H
-#define BORNAGAIN_GUI_MODELS_TYPES_VECTORITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_TYPES_VECTORITEM_H
+#define BORNAGAIN_GUI_MODEL_TYPES_VECTORITEM_H
#include "Base/Vector/Vectors3D.h"
#include "GUI/Model/Session/SessionItem.h"
@@ -50,4 +50,4 @@ private:
void updateLabel();
};
-#endif // BORNAGAIN_GUI_MODELS_TYPES_VECTORITEM_H
+#endif // BORNAGAIN_GUI_MODEL_TYPES_VECTORITEM_H
diff --git a/GUI/Util/ComboProperty.h b/GUI/Util/ComboProperty.h
index a2ec29e0b4c4b221f3f24a14a9890a421510df9a..92aec0fdd92b3aa1f04b02f04c8014e789178ddf 100644
--- a/GUI/Util/ComboProperty.h
+++ b/GUI/Util/ComboProperty.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_UTILS_COMBOPROPERTY_H
-#define BORNAGAIN_GUI_UTILS_COMBOPROPERTY_H
+#ifndef BORNAGAIN_GUI_UTIL_COMBOPROPERTY_H
+#define BORNAGAIN_GUI_UTIL_COMBOPROPERTY_H
#include <QStringList>
#include <QVariant>
@@ -72,4 +72,4 @@ private:
Q_DECLARE_METATYPE(ComboProperty)
-#endif // BORNAGAIN_GUI_UTILS_COMBOPROPERTY_H
+#endif // BORNAGAIN_GUI_UTIL_COMBOPROPERTY_H
diff --git a/GUI/Util/DeserializationException.h b/GUI/Util/DeserializationException.h
index b88c600304f48327d5d77f765031a4bd005235cb..f55df8f36a261aba365782968ee6df81f6b73632 100644
--- a/GUI/Util/DeserializationException.h
+++ b/GUI/Util/DeserializationException.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_UTILS_DESERIALIZATIONEXCEPTION_H
-#define BORNAGAIN_GUI_UTILS_DESERIALIZATIONEXCEPTION_H
+#ifndef BORNAGAIN_GUI_UTIL_DESERIALIZATIONEXCEPTION_H
+#define BORNAGAIN_GUI_UTIL_DESERIALIZATIONEXCEPTION_H
#include <QString>
@@ -32,4 +32,4 @@ private:
QString m_text;
};
-#endif // BORNAGAIN_GUI_UTILS_DESERIALIZATIONEXCEPTION_H
+#endif // BORNAGAIN_GUI_UTIL_DESERIALIZATIONEXCEPTION_H
diff --git a/GUI/Util/EditUtil.cpp b/GUI/Util/EditUtil.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..93bceca87cc6962e448dc09ef91d66d15ca98250
--- /dev/null
+++ b/GUI/Util/EditUtil.cpp
@@ -0,0 +1,65 @@
+// ************************************************************************************************
+//
+// BornAgain: simulate and fit reflection and scattering
+//
+//! @file GUI/Util/EditUtil.cpp
+//! @brief Implements GUIHelpers functions
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+// ************************************************************************************************
+
+#include "GUI/Util/GUIHelpers.h"
+#include "Fit/Param/RealLimits.h"
+#include <QApplication>
+#include <QDoubleSpinBox>
+#include <QDoubleValidator>
+#include <QLineEdit>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QValidator>
+#include <cmath>
+
+namespace {
+
+//! Single step for QDoubleSpinBox.
+double singleStep(int decimals)
+{
+ // For item with decimals=3 (i.e. 0.001) single step will be 0.1
+ return 1. / std::pow(10., decimals - 1);
+}
+
+} // namespace
+
+
+void GUI::View::EditUtil::configScientificDoubleEdit(QLineEdit* edit, const RealLimits& limits)
+{
+ auto validator = new QDoubleValidator(0.0, 1e+200, 1000, edit);
+ validator->setNotation(QDoubleValidator::ScientificNotation);
+
+ const double minimum =
+ limits.hasLowerLimit() ? std::max(limits.lowerLimit(), -1e+200) : -1e+200;
+ const double maximum =
+ limits.hasUpperLimit() ? std::min(limits.upperLimit(), +1e+200) : +1e+200;
+ validator->setRange(minimum, maximum, 1000);
+
+ edit->setValidator(validator);
+}
+
+void GUI::View::EditUtil::configSpinbox(
+ QDoubleSpinBox* spinBox, int decimals, const RealLimits& limits)
+{
+ spinBox->setMaximum(std::numeric_limits<double>::max());
+ spinBox->setMinimum(std::numeric_limits<double>::lowest());
+
+ if (limits.hasLowerLimit())
+ spinBox->setMinimum(limits.lowerLimit());
+ if (limits.hasUpperLimit())
+ spinBox->setMaximum(static_cast<int>(limits.upperLimit()));
+
+ spinBox->setDecimals(decimals);
+ spinBox->setSingleStep(singleStep(decimals));
+}
diff --git a/GUI/Util/EditUtil.h b/GUI/Util/EditUtil.h
new file mode 100644
index 0000000000000000000000000000000000000000..3cacdf90f28ef446e7c5940b32f808cf7228359e
--- /dev/null
+++ b/GUI/Util/EditUtil.h
@@ -0,0 +1,32 @@
+// ************************************************************************************************
+//
+// BornAgain: simulate and fit reflection and scattering
+//
+//! @file GUI/Util/EditUtil.h
+//! @brief Defines class GUIHelpers functions
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+// ************************************************************************************************
+
+#ifndef BORNAGAIN_GUI_UTIL_EDITUTIL_H
+#define BORNAGAIN_GUI_UTIL_EDITUTIL_H
+
+#include <QWidget>
+
+class RealLimits;
+class QDoubleSpinBox;
+class QLineEdit;
+
+namespace GUI::View::EditUtil {
+
+void configScientificDoubleEdit(QLineEdit* edit, const RealLimits& limits);
+
+void configSpinbox(QDoubleSpinBox* spinBox, int decimals, const RealLimits& limits);
+
+} // namespace GUI::View::Util
+
+#endif // BORNAGAIN_GUI_UTIL_EDITUTIL_H
diff --git a/GUI/Util/Error.h b/GUI/Util/Error.h
index 2c849893b84752c6b38fd66912fd8453013ef6e7..3ae3a39a39251bf664b6d057a60683591cb82cf1 100644
--- a/GUI/Util/Error.h
+++ b/GUI/Util/Error.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_UTILS_ERROR_H
-#define BORNAGAIN_GUI_UTILS_ERROR_H
+#ifndef BORNAGAIN_GUI_UTIL_ERROR_H
+#define BORNAGAIN_GUI_UTIL_ERROR_H
#include <QByteArray>
#include <QString>
@@ -27,4 +27,4 @@ private:
QByteArray m_messageAsLatin1;
};
-#endif // BORNAGAIN_GUI_UTILS_ERROR_H
+#endif // BORNAGAIN_GUI_UTIL_ERROR_H
diff --git a/GUI/Util/GUIHelpers.cpp b/GUI/Util/GUIHelpers.cpp
index 71ec7c23bd460a0e7d28db7a87317db08c3563df..d88b4adbf281595e38e20ded2e89b27c4387dc54 100644
--- a/GUI/Util/GUIHelpers.cpp
+++ b/GUI/Util/GUIHelpers.cpp
@@ -103,32 +103,4 @@ bool okToDelete(QWidget* parent, const QString& title, const QString& text,
return messageBox->clickedButton() == deleteButton;
}
-void configScientificDoubleEdit(QLineEdit* edit, const RealLimits& limits)
-{
- auto validator = new QDoubleValidator(0.0, 1e+200, 1000, edit);
- validator->setNotation(QDoubleValidator::ScientificNotation);
-
- const double minimum =
- limits.hasLowerLimit() ? std::max(limits.lowerLimit(), -1e+200) : -1e+200;
- const double maximum =
- limits.hasUpperLimit() ? std::min(limits.upperLimit(), +1e+200) : +1e+200;
- validator->setRange(minimum, maximum, 1000);
-
- edit->setValidator(validator);
-}
-
-void configSpinbox(QDoubleSpinBox* spinBox, int decimals, const RealLimits& limits)
-{
- spinBox->setMaximum(std::numeric_limits<double>::max());
- spinBox->setMinimum(std::numeric_limits<double>::lowest());
-
- if (limits.hasLowerLimit())
- spinBox->setMinimum(limits.lowerLimit());
- if (limits.hasUpperLimit())
- spinBox->setMaximum(static_cast<int>(limits.upperLimit()));
-
- spinBox->setDecimals(decimals);
- spinBox->setSingleStep(singleStep(decimals));
-}
-
} // namespace GUI::View::Helpers
diff --git a/GUI/Util/GUIHelpers.h b/GUI/Util/GUIHelpers.h
index fa8b6c8b575c403532dd139ded382b56036255b6..fafc6f21dbaba542a0d31e4262fb443fc911f372 100644
--- a/GUI/Util/GUIHelpers.h
+++ b/GUI/Util/GUIHelpers.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_UTILS_GUIHELPERS_H
-#define BORNAGAIN_GUI_UTILS_GUIHELPERS_H
+#ifndef BORNAGAIN_GUI_UTIL_GUIHELPERS_H
+#define BORNAGAIN_GUI_UTIL_GUIHELPERS_H
#include <QWidget>
@@ -36,11 +36,6 @@ bool question(QWidget* parent, const QString& title, const QString& text,
bool okToDelete(QWidget* parent, const QString& title, const QString& text,
const QString& detailedText = "");
-void configScientificDoubleEdit(QLineEdit* edit, const RealLimits& limits);
-
-void configSpinbox(QDoubleSpinBox* spinBox, int decimals, const RealLimits& limits);
-
-
} // namespace GUI::View::Helpers
-#endif // BORNAGAIN_GUI_UTILS_GUIHELPERS_H
+#endif // BORNAGAIN_GUI_UTIL_GUIHELPERS_H
diff --git a/GUI/Util/ItemDelegateForHTML.h b/GUI/Util/ItemDelegateForHTML.h
index 517724ef618e163eefec50b1cdd84391aaedf0c4..33355ccab5c91cadcafed0c0fb804584e4bbdfca 100644
--- a/GUI/Util/ItemDelegateForHTML.h
+++ b/GUI/Util/ItemDelegateForHTML.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_UTILS_ITEMDELEGATEFORHTML_H
-#define BORNAGAIN_GUI_UTILS_ITEMDELEGATEFORHTML_H
+#ifndef BORNAGAIN_GUI_UTIL_ITEMDELEGATEFORHTML_H
+#define BORNAGAIN_GUI_UTIL_ITEMDELEGATEFORHTML_H
#include <QStyledItemDelegate>
@@ -35,4 +35,4 @@ private:
};
-#endif // BORNAGAIN_GUI_UTILS_ITEMDELEGATEFORHTML_H
\ No newline at end of file
+#endif // BORNAGAIN_GUI_UTIL_ITEMDELEGATEFORHTML_H
\ No newline at end of file
diff --git a/GUI/Util/LayoutUtils.h b/GUI/Util/LayoutUtils.h
index 5e6722a9a8d5976825b9062917b2c7ac92369d78..343ea025cf0e7a02ca8d72e0cf0758ed46e5aba8 100644
--- a/GUI/Util/LayoutUtils.h
+++ b/GUI/Util/LayoutUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_UTILS_LAYOUTUTILS_H
-#define BORNAGAIN_GUI_UTILS_LAYOUTUTILS_H
+#ifndef BORNAGAIN_GUI_UTIL_LAYOUTUTILS_H
+#define BORNAGAIN_GUI_UTIL_LAYOUTUTILS_H
class QLayout;
class QGridLayout;
@@ -41,4 +41,4 @@ QWidget* placeHolder();
} // namespace GUI::Util::Layout
-#endif // BORNAGAIN_GUI_UTILS_LAYOUTUTILS_H
+#endif // BORNAGAIN_GUI_UTIL_LAYOUTUTILS_H
diff --git a/GUI/Util/MessageService.h b/GUI/Util/MessageService.h
index 8315e45fa12b1812989b91b3f1e22c46fa21606f..11df280cb884aa1036fe8c88c0fb26150daafcc5 100644
--- a/GUI/Util/MessageService.h
+++ b/GUI/Util/MessageService.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_UTILS_MESSAGESERVICE_H
-#define BORNAGAIN_GUI_UTILS_MESSAGESERVICE_H
+#ifndef BORNAGAIN_GUI_UTIL_MESSAGESERVICE_H
+#define BORNAGAIN_GUI_UTIL_MESSAGESERVICE_H
#include <QList>
#include <QPair>
@@ -41,4 +41,4 @@ private:
Messages m_errors;
};
-#endif // BORNAGAIN_GUI_UTILS_MESSAGESERVICE_H
+#endif // BORNAGAIN_GUI_UTIL_MESSAGESERVICE_H
diff --git a/GUI/Util/Path.h b/GUI/Util/Path.h
index af7314ee761c95985eac3c9e3a6940b969fe36ce..2612704d79c70efa1e7b44689527bf17e471287f 100644
--- a/GUI/Util/Path.h
+++ b/GUI/Util/Path.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_UTILS_PATH_H
-#define BORNAGAIN_GUI_UTILS_PATH_H
+#ifndef BORNAGAIN_GUI_UTIL_PATH_H
+#define BORNAGAIN_GUI_UTIL_PATH_H
#include <QString>
@@ -36,4 +36,4 @@ bool isVersionMatchMinimal(const QString& version, const QString& minimal_versio
} // namespace GUI::Util::Path
-#endif // BORNAGAIN_GUI_UTILS_PATH_H
+#endif // BORNAGAIN_GUI_UTIL_PATH_H
diff --git a/GUI/Util/String.h b/GUI/Util/String.h
index 7828f78349a7234cb5934fbe179b27dae1ee05dc..21706160d32e2f642e0be0fe121ba33f902196b9 100644
--- a/GUI/Util/String.h
+++ b/GUI/Util/String.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_UTILS_STRING_H
-#define BORNAGAIN_GUI_UTILS_STRING_H
+#ifndef BORNAGAIN_GUI_UTIL_STRING_H
+#define BORNAGAIN_GUI_UTIL_STRING_H
#include <QString>
#include <vector>
@@ -26,4 +26,4 @@ QString readTextFile(const QString& fileName);
} // namespace GUI::Util::String
-#endif // BORNAGAIN_GUI_UTILS_STRING_H
+#endif // BORNAGAIN_GUI_UTIL_STRING_H
diff --git a/GUI/Util/mainwindow_constants.h b/GUI/Util/mainwindow_constants.h
index ed704b659f28fd045008b26b682b7c9f4e6514d0..0e6bc68e786b3f48b79d9856aa858e1a94c30f7b 100644
--- a/GUI/Util/mainwindow_constants.h
+++ b/GUI/Util/mainwindow_constants.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_UTILS_MAINWINDOW_CONSTANTS_H
-#define BORNAGAIN_GUI_UTILS_MAINWINDOW_CONSTANTS_H
+#ifndef BORNAGAIN_GUI_UTIL_MAINWINDOW_CONSTANTS_H
+#define BORNAGAIN_GUI_UTIL_MAINWINDOW_CONSTANTS_H
#include <QString>
@@ -65,4 +65,4 @@ const int styled_toolbar_height = 25;
} // namespace GUI::Constants
-#endif // BORNAGAIN_GUI_UTILS_MAINWINDOW_CONSTANTS_H
+#endif // BORNAGAIN_GUI_UTIL_MAINWINDOW_CONSTANTS_H
diff --git a/GUI/View/Edit/DoubleLineEdit.cpp b/GUI/View/Edit/DoubleLineEdit.cpp
index 353fc1da46772f4cea83bf82e6be85f31d5f5ee9..97d4bccddce9d0200be0f161bf5277bd96577252 100644
--- a/GUI/View/Edit/DoubleLineEdit.cpp
+++ b/GUI/View/Edit/DoubleLineEdit.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/View/Edit/DoubleLineEdit.h"
-#include "GUI/Util/GUIHelpers.h"
#include <QDoubleValidator>
DoubleLineEdit::DoubleLineEdit(QWidget* parent, const DoubleDescriptor& d)
diff --git a/GUI/View/Edit/DoubleLineEdit.h b/GUI/View/Edit/DoubleLineEdit.h
index 5fcdde6db6088e09b76e539dbd18c17a1508f5eb..24135b954ab29ae315d739466cfebd6163b57447 100644
--- a/GUI/View/Edit/DoubleLineEdit.h
+++ b/GUI/View/Edit/DoubleLineEdit.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_EDIT_DOUBLELINEEDIT_H
-#define BORNAGAIN_GUI_VIEWS_EDIT_DOUBLELINEEDIT_H
+#ifndef BORNAGAIN_GUI_VIEW_EDIT_DOUBLELINEEDIT_H
+#define BORNAGAIN_GUI_VIEW_EDIT_DOUBLELINEEDIT_H
#include "GUI/Model/Types/DoubleDescriptor.h"
#include <QLineEdit>
@@ -51,4 +51,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_EDIT_DOUBLELINEEDIT_H
+#endif // BORNAGAIN_GUI_VIEW_EDIT_DOUBLELINEEDIT_H
diff --git a/GUI/View/Edit/DoubleSpinBox.cpp b/GUI/View/Edit/DoubleSpinBox.cpp
index 94169d9d513defdf4d3c29ea6ec6c9c1d4245001..b47a7f2136199ec5df58ff11a22c81d7bfb726df 100644
--- a/GUI/View/Edit/DoubleSpinBox.cpp
+++ b/GUI/View/Edit/DoubleSpinBox.cpp
@@ -13,14 +13,14 @@
// ************************************************************************************************
#include "GUI/View/Edit/DoubleSpinBox.h"
-#include "GUI/Util/GUIHelpers.h"
+#include "GUI/Util/EditUtil.h"
#include <QWheelEvent>
DoubleSpinBox::DoubleSpinBox(QWidget* parent, const DoubleDescriptor& d)
: QDoubleSpinBox(parent), m_valueDescriptor(d)
{
setFocusPolicy(Qt::StrongFocus);
- GUI::View::Helpers::configSpinbox(this, d.decimals, d.limits);
+ GUI::View::EditUtil::configSpinbox(this, d.decimals, d.limits);
setToolTip(d.tooltip);
setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
diff --git a/GUI/View/Edit/DoubleSpinBox.h b/GUI/View/Edit/DoubleSpinBox.h
index 0dabd83bc62845bf970fbe2cda3a7cd03bff7808..8b9d0629d65b424dedafab54b53a96a9b2ef3f85 100644
--- a/GUI/View/Edit/DoubleSpinBox.h
+++ b/GUI/View/Edit/DoubleSpinBox.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_EDIT_DOUBLESPINBOX_H
-#define BORNAGAIN_GUI_VIEWS_EDIT_DOUBLESPINBOX_H
+#ifndef BORNAGAIN_GUI_VIEW_EDIT_DOUBLESPINBOX_H
+#define BORNAGAIN_GUI_VIEW_EDIT_DOUBLESPINBOX_H
#include "GUI/Model/Types/DoubleDescriptor.h"
#include <QDoubleSpinBox>
@@ -73,4 +73,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_EDIT_DOUBLESPINBOX_H
+#endif // BORNAGAIN_GUI_VIEW_EDIT_DOUBLESPINBOX_H
diff --git a/GUI/View/FitWidgets/FitActivityPanel.h b/GUI/View/FitWidgets/FitActivityPanel.h
index 26658df258a172469e937941c1da1baa3d45f90c..8be98f2c4b5ed5518a5077e557afcb3843334928 100644
--- a/GUI/View/FitWidgets/FitActivityPanel.h
+++ b/GUI/View/FitWidgets/FitActivityPanel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITACTIVITYPANEL_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITACTIVITYPANEL_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITACTIVITYPANEL_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITACTIVITYPANEL_H
#include <QWidget>
@@ -58,4 +58,4 @@ private:
FitSessionManager* m_fitSessionManager;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITACTIVITYPANEL_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITACTIVITYPANEL_H
diff --git a/GUI/View/FitWidgets/FitLog.h b/GUI/View/FitWidgets/FitLog.h
index 12b6c24f9ba34fcbe9fdcf4acf37c9d7dc33bde1..ce078a6ada0302de3756a8e824b4bfbc0d30d813 100644
--- a/GUI/View/FitWidgets/FitLog.h
+++ b/GUI/View/FitWidgets/FitLog.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITLOG_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITLOG_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITLOG_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITLOG_H
#include <QObject>
@@ -46,4 +46,4 @@ private:
std::vector<Message> m_messages;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITLOG_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITLOG_H
diff --git a/GUI/View/FitWidgets/FitObjectiveBuilder.h b/GUI/View/FitWidgets/FitObjectiveBuilder.h
index 2931c8bbcfdeb5d5b88833061d6815c48da33a37..a527c88c499fce3b135bee6af887c84e1cc31849 100644
--- a/GUI/View/FitWidgets/FitObjectiveBuilder.h
+++ b/GUI/View/FitWidgets/FitObjectiveBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITOBJECTIVEBUILDER_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITOBJECTIVEBUILDER_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITOBJECTIVEBUILDER_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITOBJECTIVEBUILDER_H
#include <memory>
@@ -57,4 +57,4 @@ private:
std::unique_ptr<FitObjective> m_fit_objective;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITOBJECTIVEBUILDER_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITOBJECTIVEBUILDER_H
diff --git a/GUI/View/FitWidgets/FitParameterWidget.h b/GUI/View/FitWidgets/FitParameterWidget.h
index 5acdb726d935a80f93987b7b51740476c1fc4b28..20ad611deeb938948009408732c0c4012ab03fd9 100644
--- a/GUI/View/FitWidgets/FitParameterWidget.h
+++ b/GUI/View/FitWidgets/FitParameterWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITPARAMETERWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITPARAMETERWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPARAMETERWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPARAMETERWIDGET_H
#include "GUI/Widget/Common/SessionItemWidget.h"
#include <memory>
@@ -95,4 +95,4 @@ private:
OverlayLabelController* m_infoLabel;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITPARAMETERWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPARAMETERWIDGET_H
diff --git a/GUI/View/FitWidgets/FitProgressInfo.h b/GUI/View/FitWidgets/FitProgressInfo.h
index c30e2a66228f94e95defdde3073a8bb4e8b3e2d3..c74c0199b7618b5212cbd1c242189e29189dfb88 100644
--- a/GUI/View/FitWidgets/FitProgressInfo.h
+++ b/GUI/View/FitWidgets/FitProgressInfo.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITPROGRESSINFO_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITPROGRESSINFO_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPROGRESSINFO_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPROGRESSINFO_H
#include <string>
#include <vector>
@@ -41,4 +41,4 @@ private:
std::vector<double> m_sim_values;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITPROGRESSINFO_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPROGRESSINFO_H
diff --git a/GUI/View/FitWidgets/FitResultsWidget.h b/GUI/View/FitWidgets/FitResultsWidget.h
index 6c12badb4721b4a290df4f8bdc6d422cc76bdc64..68a436470d7e9a65e5d1d76dc43a9da88f7e1a1c 100644
--- a/GUI/View/FitWidgets/FitResultsWidget.h
+++ b/GUI/View/FitWidgets/FitResultsWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITRESULTSWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITRESULTSWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITRESULTSWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITRESULTSWIDGET_H
#include <QWidget>
@@ -26,4 +26,4 @@ public:
FitResultsWidget(QWidget* parent = 0);
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITRESULTSWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITRESULTSWIDGET_H
diff --git a/GUI/View/FitWidgets/FitSessionController.h b/GUI/View/FitWidgets/FitSessionController.h
index d4ef9b0f5cb1b83bbadba37c9f0b9c0f08c85bde..0b77c066b2a58274592017e8c2f247cdcdf2034c 100644
--- a/GUI/View/FitWidgets/FitSessionController.h
+++ b/GUI/View/FitWidgets/FitSessionController.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITSESSIONCONTROLLER_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITSESSIONCONTROLLER_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONCONTROLLER_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONCONTROLLER_H
#include <QObject>
#include <memory>
@@ -65,4 +65,4 @@ private:
bool m_block_progress_update;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITSESSIONCONTROLLER_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONCONTROLLER_H
diff --git a/GUI/View/FitWidgets/FitSessionManager.h b/GUI/View/FitWidgets/FitSessionManager.h
index 6793837b429fb88d428416da3c2e3e925a5bcd8b..564181b25f97ab20d69fecc94e4282ca1f74c4ec 100644
--- a/GUI/View/FitWidgets/FitSessionManager.h
+++ b/GUI/View/FitWidgets/FitSessionManager.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITSESSIONMANAGER_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITSESSIONMANAGER_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONMANAGER_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONMANAGER_H
#include <QMap>
#include <QObject>
@@ -41,4 +41,4 @@ private:
QMap<SessionItem*, FitSessionController*> m_item_to_controller;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITSESSIONMANAGER_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONMANAGER_H
diff --git a/GUI/View/FitWidgets/FitSessionWidget.h b/GUI/View/FitWidgets/FitSessionWidget.h
index 9424ac0862602b64f19d9722049f20d7592ede6c..792ac69db52878bc92ca8825bffdf36c768730a9 100644
--- a/GUI/View/FitWidgets/FitSessionWidget.h
+++ b/GUI/View/FitWidgets/FitSessionWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITSESSIONWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITSESSIONWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONWIDGET_H
#include "GUI/View/FitWidgets/FitProgressInfo.h"
#include <QWidget>
@@ -55,4 +55,4 @@ private:
FitSessionController* m_sessionController;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITSESSIONWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONWIDGET_H
diff --git a/GUI/View/FitWidgets/FitWorker.h b/GUI/View/FitWidgets/FitWorker.h
index f33d3a824b891606e6ba8394f9b3c9d64e1efac2..e354e7a1499c8a1273e4c5e28d2b42d4884cbde1 100644
--- a/GUI/View/FitWidgets/FitWorker.h
+++ b/GUI/View/FitWidgets/FitWorker.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITWORKER_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITWORKER_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITWORKER_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITWORKER_H
#include <QObject>
#include <memory>
@@ -44,4 +44,4 @@ private:
std::shared_ptr<FitObjectiveBuilder> m_fit_objective;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITWORKER_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITWORKER_H
diff --git a/GUI/View/FitWidgets/FitWorkerLauncher.h b/GUI/View/FitWidgets/FitWorkerLauncher.h
index 0c5c1f09f833c9d4027f966de157e64c8e850d1e..27b32b32c15a1d364bd7aae10017f408f7ec2289 100644
--- a/GUI/View/FitWidgets/FitWorkerLauncher.h
+++ b/GUI/View/FitWidgets/FitWorkerLauncher.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITWORKERLAUNCHER_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITWORKERLAUNCHER_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITWORKERLAUNCHER_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITWORKERLAUNCHER_H
#include <QDateTime>
#include <QObject>
@@ -56,4 +56,4 @@ private:
QDateTime m_fit_end;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITWORKERLAUNCHER_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITWORKERLAUNCHER_H
diff --git a/GUI/View/FitWidgets/GUIFitObserver.h b/GUI/View/FitWidgets/GUIFitObserver.h
index efbf482c05a762147160344e6961e6fdde89de14..bf92d41acde43387fa9c932fe06cb5dbf1f0d6c6 100644
--- a/GUI/View/FitWidgets/GUIFitObserver.h
+++ b/GUI/View/FitWidgets/GUIFitObserver.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_GUIFITOBSERVER_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_GUIFITOBSERVER_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_GUIFITOBSERVER_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_GUIFITOBSERVER_H
#include "GUI/View/FitWidgets/FitProgressInfo.h"
#include <QObject>
@@ -57,4 +57,4 @@ private:
FitProgressInfo m_iteration_info;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_GUIFITOBSERVER_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_GUIFITOBSERVER_H
diff --git a/GUI/View/FitWidgets/JobRealTimeToolBar.h b/GUI/View/FitWidgets/JobRealTimeToolBar.h
index f1c83663e87f923a61a7649ac64f754c9a68ac3a..c263cf2c3ad79522e8902ab58d930116c1b4aeef 100644
--- a/GUI/View/FitWidgets/JobRealTimeToolBar.h
+++ b/GUI/View/FitWidgets/JobRealTimeToolBar.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMETOOLBAR_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMETOOLBAR_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBREALTIMETOOLBAR_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBREALTIMETOOLBAR_H
#include "GUI/Widget/Common/StyledToolBar.h"
@@ -34,4 +34,4 @@ private:
QToolButton* m_resetParametersButton;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMETOOLBAR_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBREALTIMETOOLBAR_H
diff --git a/GUI/View/FitWidgets/JobRealTimeWidget.h b/GUI/View/FitWidgets/JobRealTimeWidget.h
index 44795f702c22d40d676e8d249290cfcf6993e1fb..40f89c479139c452739ffe6a1b1bc12442b3ce72 100644
--- a/GUI/View/FitWidgets/JobRealTimeWidget.h
+++ b/GUI/View/FitWidgets/JobRealTimeWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMEWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMEWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBREALTIMEWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBREALTIMEWIDGET_H
#include "GUI/Widget/Common/ItemStackPresenter.h"
@@ -43,4 +43,4 @@ private:
ItemStackPresenter<ParameterTuningWidget>* m_stackedWidget;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_JOBREALTIMEWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBREALTIMEWIDGET_H
diff --git a/GUI/View/FitWidgets/MinimizerSettingsWidget.h b/GUI/View/FitWidgets/MinimizerSettingsWidget.h
index 87758a62f7ce0023c5c953b2a016b14582eae7aa..9c5c5d77f0b64c0315cc2101841ff444ca15937c 100644
--- a/GUI/View/FitWidgets/MinimizerSettingsWidget.h
+++ b/GUI/View/FitWidgets/MinimizerSettingsWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_MINIMIZERSETTINGSWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_MINIMIZERSETTINGSWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_MINIMIZERSETTINGSWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_MINIMIZERSETTINGSWIDGET_H
#include <QWidget>
@@ -41,4 +41,4 @@ private:
ComponentEditor* m_componentEditor;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_MINIMIZERSETTINGSWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_MINIMIZERSETTINGSWIDGET_H
diff --git a/GUI/View/FitWidgets/ParameterTuningDelegate.h b/GUI/View/FitWidgets/ParameterTuningDelegate.h
index a80b7eddf222e62a4a95d1306348ba33a47561d4..84f2f596c5e15c26e121dff26af58a19a3a7e126 100644
--- a/GUI/View/FitWidgets/ParameterTuningDelegate.h
+++ b/GUI/View/FitWidgets/ParameterTuningDelegate.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_PARAMETERTUNINGDELEGATE_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_PARAMETERTUNINGDELEGATE_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_PARAMETERTUNINGDELEGATE_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_PARAMETERTUNINGDELEGATE_H
#include "Fit/Param/RealLimits.h"
#include <QItemDelegate>
@@ -86,4 +86,4 @@ private:
bool m_isReadOnly;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_PARAMETERTUNINGDELEGATE_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_PARAMETERTUNINGDELEGATE_H
diff --git a/GUI/View/FitWidgets/ParameterTuningWidget.h b/GUI/View/FitWidgets/ParameterTuningWidget.h
index 3e10f055ddc9fdd35ea89b4ebee7b1ac6c3e3e84..a0d9dfa71bf6dabb933953c2e656bffd19c2c323 100644
--- a/GUI/View/FitWidgets/ParameterTuningWidget.h
+++ b/GUI/View/FitWidgets/ParameterTuningWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_PARAMETERTUNINGWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_PARAMETERTUNINGWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_PARAMETERTUNINGWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_PARAMETERTUNINGWIDGET_H
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -77,4 +77,4 @@ private:
CautionSign* m_cautionSign;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_PARAMETERTUNINGWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_PARAMETERTUNINGWIDGET_H
diff --git a/GUI/View/FitWidgets/RunFitControlWidget.h b/GUI/View/FitWidgets/RunFitControlWidget.h
index fe0365d2957ef8e13ba6c754220671e690ca7527..efa08d14c0ce4379ea76d8838451e2dfc5bea2d1 100644
--- a/GUI/View/FitWidgets/RunFitControlWidget.h
+++ b/GUI/View/FitWidgets/RunFitControlWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_RUNFITCONTROLWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_RUNFITCONTROLWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_RUNFITCONTROLWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_RUNFITCONTROLWIDGET_H
#include "GUI/Widget/Common/SessionItemWidget.h"
#include <QWidget>
@@ -67,4 +67,4 @@ private:
CautionSign* m_cautionSign;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_RUNFITCONTROLWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_RUNFITCONTROLWIDGET_H
diff --git a/GUI/View/FitWidgets/SliderSettingsWidget.h b/GUI/View/FitWidgets/SliderSettingsWidget.h
index 91e517ed1e305fe813f2866b4cc5ee20ec664b66..009ea18864ea262a6046a70e39adf44268932d99 100644
--- a/GUI/View/FitWidgets/SliderSettingsWidget.h
+++ b/GUI/View/FitWidgets/SliderSettingsWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_SLIDERSETTINGSWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_SLIDERSETTINGSWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_SLIDERSETTINGSWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITWIDGETS_SLIDERSETTINGSWIDGET_H
#include <QWidget>
@@ -42,4 +42,4 @@ private:
QCheckBox* m_lockzCheckBox;
};
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_SLIDERSETTINGSWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_SLIDERSETTINGSWIDGET_H
diff --git a/GUI/View/ImportDataWidgets/ImportDataUtils.h b/GUI/View/ImportDataWidgets/ImportDataUtils.h
index 6fba9039c92dbacea50be68dd38755dc12fe6eff..4422de2397295ec810ba41a17ec4fdc35a04a554 100644
--- a/GUI/View/ImportDataWidgets/ImportDataUtils.h
+++ b/GUI/View/ImportDataWidgets/ImportDataUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_IMPORTDATAUTILS_H
-#define BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_IMPORTDATAUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_IMPORTDATAUTILS_H
+#define BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_IMPORTDATAUTILS_H
#include "Device/Histo/IntensityDataIOFactory.h"
#include <QString>
@@ -44,4 +44,4 @@ QString Import1dData(RealDataItem* realDataItem, const AbstractDataLoader* selec
}; // namespace GUI::View::ImportDataUtils
-#endif // BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_IMPORTDATAUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_IMPORTDATAUTILS_H
diff --git a/GUI/View/ImportDataWidgets/RealDataMaskWidget.h b/GUI/View/ImportDataWidgets/RealDataMaskWidget.h
index 0f5cef60b1765efaf8fa8914ff6395ce9df36d69..12d1374c30300e5f230a03a1c1a192a8281e0e38 100644
--- a/GUI/View/ImportDataWidgets/RealDataMaskWidget.h
+++ b/GUI/View/ImportDataWidgets/RealDataMaskWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
+#define BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -44,4 +44,4 @@ private:
MaskEditor* m_maskEditor;
};
-#endif // BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
diff --git a/GUI/View/ImportDataWidgets/RealDataPresenter.h b/GUI/View/ImportDataWidgets/RealDataPresenter.h
index 5e2612bd2940c50d7d31e0b3799661f5bba69fc1..06b41a2ce2b57518b2e874ba1505839da7547ce6 100644
--- a/GUI/View/ImportDataWidgets/RealDataPresenter.h
+++ b/GUI/View/ImportDataWidgets/RealDataPresenter.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
-#define BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
+#ifndef BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
+#define BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
#include "GUI/Widget/Common/ItemComboWidget.h"
@@ -34,4 +34,4 @@ protected:
QStringList activePresentationList(SessionItem* item);
};
-#endif // BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
+#endif // BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
diff --git a/GUI/View/ImportDataWidgets/RealDataPropertiesWidget.h b/GUI/View/ImportDataWidgets/RealDataPropertiesWidget.h
index 550af35f3bb02199908409a2f4bbb93357b0336a..52317a238dec5eaac229e85e59e31bc9d0024b1b 100644
--- a/GUI/View/ImportDataWidgets/RealDataPropertiesWidget.h
+++ b/GUI/View/ImportDataWidgets/RealDataPropertiesWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPROPERTIESWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPROPERTIESWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAPROPERTIESWIDGET_H
+#define BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAPROPERTIESWIDGET_H
#include <QWidget>
@@ -49,4 +49,4 @@ private:
ProjectDocument* m_document;
};
-#endif // BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPROPERTIESWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATAPROPERTIESWIDGET_H
diff --git a/GUI/View/ImportDataWidgets/RealDataSelectorWidget.h b/GUI/View/ImportDataWidgets/RealDataSelectorWidget.h
index ef1f0fc20e76eed703e77eb12cceceff956af26f..72db98a61b1e883633aa75205a18ce19c8623d48 100644
--- a/GUI/View/ImportDataWidgets/RealDataSelectorWidget.h
+++ b/GUI/View/ImportDataWidgets/RealDataSelectorWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATASELECTORWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATASELECTORWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATASELECTORWIDGET_H
+#define BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATASELECTORWIDGET_H
#include <QModelIndex>
#include <QWidget>
@@ -78,4 +78,4 @@ public:
QAction* m_removeDataAction;
};
-#endif // BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATASELECTORWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATASELECTORWIDGET_H
diff --git a/GUI/View/ImportDataWidgets/RealDataTreeModel.h b/GUI/View/ImportDataWidgets/RealDataTreeModel.h
index 4e15c5656cdb722466cab2dc67e6409a348909c9..3e8d7ef380305c8cc8de80f45add70eac4a3de66 100644
--- a/GUI/View/ImportDataWidgets/RealDataTreeModel.h
+++ b/GUI/View/ImportDataWidgets/RealDataTreeModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATATREEMODEL_H
-#define BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATATREEMODEL_H
+#ifndef BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATATREEMODEL_H
+#define BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATATREEMODEL_H
#include <QAbstractItemModel>
#include <QSet>
@@ -63,4 +63,4 @@ private:
QSet<int> m_visibleRanks;
};
-#endif // BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_REALDATATREEMODEL_H
+#endif // BORNAGAIN_GUI_VIEW_IMPORTDATAWIDGETS_REALDATATREEMODEL_H
diff --git a/GUI/View/InstrumentWidgets/DepthProbeInstrumentEditor.h b/GUI/View/InstrumentWidgets/DepthProbeInstrumentEditor.h
index 38b89f3279e7b44ea008eb61185ff6bf45f1ccb0..554ee3be6cc7084b12c9d5577d40191c9d2d8ebd 100644
--- a/GUI/View/InstrumentWidgets/DepthProbeInstrumentEditor.h
+++ b/GUI/View/InstrumentWidgets/DepthProbeInstrumentEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DEPTHPROBEINSTRUMENTEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DEPTHPROBEINSTRUMENTEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DEPTHPROBEINSTRUMENTEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DEPTHPROBEINSTRUMENTEDITOR_H
#include <QWidget>
@@ -37,4 +37,4 @@ private:
PolarizationAnalysisEditor* m_polpairAnalysisEditor;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DEPTHPROBEINSTRUMENTEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DEPTHPROBEINSTRUMENTEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/DetectorAlignmentEditor.h b/GUI/View/InstrumentWidgets/DetectorAlignmentEditor.h
index 0fafdc04fe84de9d2a1ed344a451d146b6b88e93..716fcbaac4c7f71c94696430e68d6cff975e347a 100644
--- a/GUI/View/InstrumentWidgets/DetectorAlignmentEditor.h
+++ b/GUI/View/InstrumentWidgets/DetectorAlignmentEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DETECTORALIGNMENTEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DETECTORALIGNMENTEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DETECTORALIGNMENTEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DETECTORALIGNMENTEDITOR_H
#include <QWidget>
@@ -45,4 +45,4 @@ private:
RectangularDetectorItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DETECTORALIGNMENTEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DETECTORALIGNMENTEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/DetectorEditor.h b/GUI/View/InstrumentWidgets/DetectorEditor.h
index cbdbe6247efbe4fa028bb20c2ebed3f72ce73a5f..65b24b3aaed857e4d317a9890617a558d6748790 100644
--- a/GUI/View/InstrumentWidgets/DetectorEditor.h
+++ b/GUI/View/InstrumentWidgets/DetectorEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DETECTOREDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DETECTOREDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DETECTOREDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DETECTOREDITOR_H
#include <QWidget>
@@ -46,4 +46,4 @@ private:
Instrument2DItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DETECTOREDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DETECTOREDITOR_H
diff --git a/GUI/View/InstrumentWidgets/DistributionEditor.h b/GUI/View/InstrumentWidgets/DistributionEditor.h
index 164d667d19fb34101b2e4951d02ca5253ad82546..7c3d34f70aaf26b13841876e128e8f82e8ad9f8e 100644
--- a/GUI/View/InstrumentWidgets/DistributionEditor.h
+++ b/GUI/View/InstrumentWidgets/DistributionEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DISTRIBUTIONEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DISTRIBUTIONEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DISTRIBUTIONEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DISTRIBUTIONEDITOR_H
#include <QWidget>
@@ -103,4 +103,4 @@ private:
/// utility function to show the EditDistributionDialog for a selector
void showEditDistributionDialog(DistributionSelector* selector, const QString& title);
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DISTRIBUTIONEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DISTRIBUTIONEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/DistributionForms.h b/GUI/View/InstrumentWidgets/DistributionForms.h
index 3887929354fa3624eb4e6b5c48058bd004813842..dc95c6ce493757fb59875ef03afe978bd1c1c8a1 100644
--- a/GUI/View/InstrumentWidgets/DistributionForms.h
+++ b/GUI/View/InstrumentWidgets/DistributionForms.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DISTRIBUTIONFORMS_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DISTRIBUTIONFORMS_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DISTRIBUTIONFORMS_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DISTRIBUTIONFORMS_H
#include <QWidget>
@@ -195,4 +195,4 @@ private:
DistributionTrapezoidItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DISTRIBUTIONFORMS_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DISTRIBUTIONFORMS_H
diff --git a/GUI/View/InstrumentWidgets/DistributionPlot.h b/GUI/View/InstrumentWidgets/DistributionPlot.h
index 78add73a15c5f5b3d66cb9c467667cde284d1596..db13dcb98efb4489898c0935afaa426784ce3665 100644
--- a/GUI/View/InstrumentWidgets/DistributionPlot.h
+++ b/GUI/View/InstrumentWidgets/DistributionPlot.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DISTRIBUTIONPLOT_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DISTRIBUTIONPLOT_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DISTRIBUTIONPLOT_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DISTRIBUTIONPLOT_H
#include <QWidget>
#include <qcustomplot.h>
@@ -66,4 +66,4 @@ private:
CautionSign* m_cautionSign;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_DISTRIBUTIONPLOT_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_DISTRIBUTIONPLOT_H
diff --git a/GUI/View/InstrumentWidgets/EditDistributionDialog.h b/GUI/View/InstrumentWidgets/EditDistributionDialog.h
index 1b46b44818d288c1f73c9e87af585917598c8e26..1e5a82822a437b1089390526b96efa167cdf35fc 100644
--- a/GUI/View/InstrumentWidgets/EditDistributionDialog.h
+++ b/GUI/View/InstrumentWidgets/EditDistributionDialog.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_EDITDISTRIBUTIONDIALOG_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_EDITDISTRIBUTIONDIALOG_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_EDITDISTRIBUTIONDIALOG_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_EDITDISTRIBUTIONDIALOG_H
#include "GUI/View/InstrumentWidgets/DistributionEditor.h"
@@ -42,4 +42,4 @@ private:
ItemWithDistribution* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_EDITDISTRIBUTIONDIALOG_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_EDITDISTRIBUTIONDIALOG_H
diff --git a/GUI/View/InstrumentWidgets/EnvironmentEditor.h b/GUI/View/InstrumentWidgets/EnvironmentEditor.h
index 5c5134f2e0aee90d4c935dd2cb63301520afeebe..36baac5b0cf6a4bb7dc1b61e1327a11a3cbe7704 100644
--- a/GUI/View/InstrumentWidgets/EnvironmentEditor.h
+++ b/GUI/View/InstrumentWidgets/EnvironmentEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_ENVIRONMENTEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_ENVIRONMENTEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_ENVIRONMENTEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_ENVIRONMENTEDITOR_H
#include <QWidget>
@@ -43,4 +43,4 @@ private:
InstrumentItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_ENVIRONMENTEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_ENVIRONMENTEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/FootprintCorrectionEditor.h b/GUI/View/InstrumentWidgets/FootprintCorrectionEditor.h
index 7cdc39ae1b01127fd643375413b026b0e3d65b0e..00bb7895c640d4c1f0e51db2766eb888021f2494 100644
--- a/GUI/View/InstrumentWidgets/FootprintCorrectionEditor.h
+++ b/GUI/View/InstrumentWidgets/FootprintCorrectionEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_FOOTPRINTCORRECTIONEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_FOOTPRINTCORRECTIONEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_FOOTPRINTCORRECTIONEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_FOOTPRINTCORRECTIONEDITOR_H
#include <QWidget>
@@ -46,4 +46,4 @@ private:
SpecularBeamItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_FOOTPRINTCORRECTIONEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_FOOTPRINTCORRECTIONEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/GISASBeamEditor.h b/GUI/View/InstrumentWidgets/GISASBeamEditor.h
index a5d51ce4f501ef7433567281caf0b4d148beeded..60d2c35bce1c468dd5e2edfc20a5ec82a60a604b 100644
--- a/GUI/View/InstrumentWidgets/GISASBeamEditor.h
+++ b/GUI/View/InstrumentWidgets/GISASBeamEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_GISASBEAMEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_GISASBEAMEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_GISASBEAMEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_GISASBEAMEDITOR_H
#include <QWidget>
@@ -42,4 +42,4 @@ private:
BeamItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_GISASBEAMEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_GISASBEAMEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/GISASInstrumentEditor.h b/GUI/View/InstrumentWidgets/GISASInstrumentEditor.h
index c325556e3a3507235aa98120fc673047a6851bf9..51359fede84d0f0d15e87421dea81bfdc2383317 100644
--- a/GUI/View/InstrumentWidgets/GISASInstrumentEditor.h
+++ b/GUI/View/InstrumentWidgets/GISASInstrumentEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_GISASINSTRUMENTEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_GISASINSTRUMENTEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_GISASINSTRUMENTEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_GISASINSTRUMENTEDITOR_H
#include <QWidget>
@@ -39,4 +39,4 @@ private:
EnvironmentEditor* m_environmentEditor;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_GISASINSTRUMENTEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_GISASINSTRUMENTEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/InclinationAnglesEditor.h b/GUI/View/InstrumentWidgets/InclinationAnglesEditor.h
index 7ba112424b21e9e166e3706e86f8e029d3d24b75..babd65584c0caab30362523d95dc3d03a03dfd80 100644
--- a/GUI/View/InstrumentWidgets/InclinationAnglesEditor.h
+++ b/GUI/View/InstrumentWidgets/InclinationAnglesEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INCLINATIONANGLESEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INCLINATIONANGLESEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INCLINATIONANGLESEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INCLINATIONANGLESEDITOR_H
#include <QWidget>
@@ -46,4 +46,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INCLINATIONANGLESEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INCLINATIONANGLESEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/InstrumentEditor.h b/GUI/View/InstrumentWidgets/InstrumentEditor.h
index fee1177f803b385cacdb7f11392b6a9e94a61441..6d0dbd9403f93dd8aa6fab5c7453c4c77ac80bd9 100644
--- a/GUI/View/InstrumentWidgets/InstrumentEditor.h
+++ b/GUI/View/InstrumentWidgets/InstrumentEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INSTRUMENTEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INSTRUMENTEDITOR_H
#include <QWidget>
@@ -59,4 +59,4 @@ private:
InstrumentItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INSTRUMENTEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/InstrumentLibraryEditor.h b/GUI/View/InstrumentWidgets/InstrumentLibraryEditor.h
index 31a7a42497f8224751a61bab18168f752ac740cd..0f537eda4577cd8ff52bb90196752de044754229 100644
--- a/GUI/View/InstrumentWidgets/InstrumentLibraryEditor.h
+++ b/GUI/View/InstrumentWidgets/InstrumentLibraryEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTLIBRARYEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTLIBRARYEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INSTRUMENTLIBRARYEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INSTRUMENTLIBRARYEDITOR_H
#include "GUI/Model/Instrument/InstrumentsTreeModel.h"
#include <QDialog>
@@ -71,4 +71,4 @@ private:
InstrumentItem* m_chosenItem;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTLIBRARYEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INSTRUMENTLIBRARYEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/InstrumentListModel.h b/GUI/View/InstrumentWidgets/InstrumentListModel.h
index a1925286f946bd6a05b250d6b842f19ae847f5fc..8cbbb6679ef1e0232ee1cff954e1fadf2c48bae2 100644
--- a/GUI/View/InstrumentWidgets/InstrumentListModel.h
+++ b/GUI/View/InstrumentWidgets/InstrumentListModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTLISTMODEL_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTLISTMODEL_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INSTRUMENTLISTMODEL_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INSTRUMENTLISTMODEL_H
#include <QAbstractListModel>
#include <QIcon>
@@ -64,4 +64,4 @@ private:
QIcon m_depthProbeIcon;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTLISTMODEL_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INSTRUMENTLISTMODEL_H
diff --git a/GUI/View/InstrumentWidgets/InstrumentListView.h b/GUI/View/InstrumentWidgets/InstrumentListView.h
index 9ac2bfe687c1eac73350be3f7c3b02f3b33d6c95..8ee5afafa28676328f3dc3f0f83604acbb64df57 100644
--- a/GUI/View/InstrumentWidgets/InstrumentListView.h
+++ b/GUI/View/InstrumentWidgets/InstrumentListView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTLISTVIEW_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTLISTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INSTRUMENTLISTVIEW_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INSTRUMENTLISTVIEW_H
#include <QWidget>
@@ -77,4 +77,4 @@ private:
QAction* m_loadFromLibraryAction;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTLISTVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INSTRUMENTLISTVIEW_H
diff --git a/GUI/View/InstrumentWidgets/InstrumentView.h b/GUI/View/InstrumentWidgets/InstrumentView.h
index ce72dac6a3ed87fd01eeb5815a84b06c100d8bd3..ef163ecc29e866a07e3a46f0d3e1853f260cdd2c 100644
--- a/GUI/View/InstrumentWidgets/InstrumentView.h
+++ b/GUI/View/InstrumentWidgets/InstrumentView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTVIEW_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INSTRUMENTVIEW_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INSTRUMENTVIEW_H
#include <QWidget>
@@ -41,4 +41,4 @@ private:
ProjectDocument* m_document;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_INSTRUMENTVIEW_H
diff --git a/GUI/View/InstrumentWidgets/OffSpecularBeamEditor.h b/GUI/View/InstrumentWidgets/OffSpecularBeamEditor.h
index c363a6044e7a39c3c61d213e03ade923e769b7f0..259f3e414fdb15ea155441c40fca0b2946c78780 100644
--- a/GUI/View/InstrumentWidgets/OffSpecularBeamEditor.h
+++ b/GUI/View/InstrumentWidgets/OffSpecularBeamEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_OFFSPECULARBEAMEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_OFFSPECULARBEAMEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_OFFSPECULARBEAMEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_OFFSPECULARBEAMEDITOR_H
#include <QWidget>
@@ -43,4 +43,4 @@ private:
OffSpecularInstrumentItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_OFFSPECULARBEAMEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_OFFSPECULARBEAMEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/OffSpecularInstrumentEditor.h b/GUI/View/InstrumentWidgets/OffSpecularInstrumentEditor.h
index 7fc2f87af9e1388fec1b1d323bd2351ce9814ab0..4a76c8466fe2c3791ad7ad995ff5c99463adc8bd 100644
--- a/GUI/View/InstrumentWidgets/OffSpecularInstrumentEditor.h
+++ b/GUI/View/InstrumentWidgets/OffSpecularInstrumentEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_OFFSPECULARINSTRUMENTEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_OFFSPECULARINSTRUMENTEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_OFFSPECULARINSTRUMENTEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_OFFSPECULARINSTRUMENTEDITOR_H
#include <QWidget>
@@ -35,4 +35,4 @@ private:
PolarizationAnalysisEditor* m_polpairAnalysisEditor;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_OFFSPECULARINSTRUMENTEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_OFFSPECULARINSTRUMENTEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/PolarizationAnalysisEditor.h b/GUI/View/InstrumentWidgets/PolarizationAnalysisEditor.h
index 210867e4a80872550621595972d6421f622ce0cc..00ed5684a2cac786257bdfcbe1e712243f86738e 100644
--- a/GUI/View/InstrumentWidgets/PolarizationAnalysisEditor.h
+++ b/GUI/View/InstrumentWidgets/PolarizationAnalysisEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_POLARIZATIONANALYSISEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_POLARIZATIONANALYSISEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_POLARIZATIONANALYSISEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_POLARIZATIONANALYSISEDITOR_H
#include <QWidget>
@@ -46,4 +46,4 @@ private:
InstrumentItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_POLARIZATIONANALYSISEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_POLARIZATIONANALYSISEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/RectangularDetectorEditor.h b/GUI/View/InstrumentWidgets/RectangularDetectorEditor.h
index 2f9e6c251ea59910145dddbc1b2da7ea1be3eee6..f73636cf98005fbe77907fb5a726da4685ec0fbb 100644
--- a/GUI/View/InstrumentWidgets/RectangularDetectorEditor.h
+++ b/GUI/View/InstrumentWidgets/RectangularDetectorEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_RECTANGULARDETECTOREDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_RECTANGULARDETECTOREDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_RECTANGULARDETECTOREDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_RECTANGULARDETECTOREDITOR_H
#include <QWidget>
@@ -36,4 +36,4 @@ private:
DetectorAlignmentEditor* m_alignmentEditor;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_RECTANGULARDETECTOREDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_RECTANGULARDETECTOREDITOR_H
diff --git a/GUI/View/InstrumentWidgets/ResolutionFunctionEditor.h b/GUI/View/InstrumentWidgets/ResolutionFunctionEditor.h
index 77f09199cb88d3e78251ca307734a547a380f13a..49ee3a3bc439fb7edc6dce15753118230cf4932f 100644
--- a/GUI/View/InstrumentWidgets/ResolutionFunctionEditor.h
+++ b/GUI/View/InstrumentWidgets/ResolutionFunctionEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_RESOLUTIONFUNCTIONEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_RESOLUTIONFUNCTIONEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_RESOLUTIONFUNCTIONEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_RESOLUTIONFUNCTIONEDITOR_H
#include <QWidget>
@@ -47,4 +47,4 @@ private:
DetectorItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_RESOLUTIONFUNCTIONEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_RESOLUTIONFUNCTIONEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/SpecularBeamEditor.h b/GUI/View/InstrumentWidgets/SpecularBeamEditor.h
index 33f6e9bdc49e0cdd813d800f1dda5d1f835ed559..c93cb5aef8de116da6104c6415cf40269305e7c5 100644
--- a/GUI/View/InstrumentWidgets/SpecularBeamEditor.h
+++ b/GUI/View/InstrumentWidgets/SpecularBeamEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_SPECULARBEAMEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_SPECULARBEAMEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_SPECULARBEAMEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_SPECULARBEAMEDITOR_H
#include <QWidget>
@@ -44,4 +44,4 @@ private:
SpecularBeamItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_SPECULARBEAMEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_SPECULARBEAMEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/SpecularInstrumentEditor.h b/GUI/View/InstrumentWidgets/SpecularInstrumentEditor.h
index eb5a88128f8374e070ca2b924978432718c1dc13..b7814e6f3fa5f6c1eb3492f1f3f936f559315fe1 100644
--- a/GUI/View/InstrumentWidgets/SpecularInstrumentEditor.h
+++ b/GUI/View/InstrumentWidgets/SpecularInstrumentEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_SPECULARINSTRUMENTEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_SPECULARINSTRUMENTEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_SPECULARINSTRUMENTEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_SPECULARINSTRUMENTEDITOR_H
#include <QWidget>
@@ -35,4 +35,4 @@ private:
EnvironmentEditor* m_environmentEditor;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_SPECULARINSTRUMENTEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_SPECULARINSTRUMENTEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/SphericalAxisEditor.h b/GUI/View/InstrumentWidgets/SphericalAxisEditor.h
index b470943ed3f2efe639ac22d47c694cd0254a0b37..88a7045fd8c267a8885b7eef8daced37168ca787 100644
--- a/GUI/View/InstrumentWidgets/SphericalAxisEditor.h
+++ b/GUI/View/InstrumentWidgets/SphericalAxisEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_SPHERICALAXISEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_SPHERICALAXISEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_SPHERICALAXISEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_SPHERICALAXISEDITOR_H
#include <QWidget>
@@ -62,4 +62,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_SPHERICALAXISEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_SPHERICALAXISEDITOR_H
diff --git a/GUI/View/InstrumentWidgets/SphericalDetectorEditor.h b/GUI/View/InstrumentWidgets/SphericalDetectorEditor.h
index ee2d86d586ff70555be28a69812a16ddac148d76..08e1fc8db630407bc94ac4981af87bddf9bb29a9 100644
--- a/GUI/View/InstrumentWidgets/SphericalDetectorEditor.h
+++ b/GUI/View/InstrumentWidgets/SphericalDetectorEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_SPHERICALDETECTOREDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_SPHERICALDETECTOREDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_SPHERICALDETECTOREDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_SPHERICALDETECTOREDITOR_H
#include <QWidget>
@@ -34,4 +34,4 @@ private:
ResolutionFunctionEditor* m_resolutionFunctionEditor;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_SPHERICALDETECTOREDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_SPHERICALDETECTOREDITOR_H
diff --git a/GUI/View/InstrumentWidgets/VectorEditor.h b/GUI/View/InstrumentWidgets/VectorEditor.h
index 5b48921c9cd7a2550aee63a95cdafa9de824cdb5..e142ebe16c553abeb1ff7f500cfdef740f31f68b 100644
--- a/GUI/View/InstrumentWidgets/VectorEditor.h
+++ b/GUI/View/InstrumentWidgets/VectorEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_VECTOREDITOR_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_VECTOREDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_VECTOREDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_VECTOREDITOR_H
#include <QWidget>
@@ -49,4 +49,4 @@ private:
VectorItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_VECTOREDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENTWIDGETS_VECTOREDITOR_H
diff --git a/GUI/View/IntensityDataWidgets/ColorMap.h b/GUI/View/IntensityDataWidgets/ColorMap.h
index 7de9245f88bf1bc46ea7c10d09ad063e5bea31a8..40fc9aaa946e37333d64bd8ee07bb8170aaa19ec 100644
--- a/GUI/View/IntensityDataWidgets/ColorMap.h
+++ b/GUI/View/IntensityDataWidgets/ColorMap.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAP_H
-#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAP_H
+#ifndef BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_COLORMAP_H
+#define BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_COLORMAP_H
#include "GUI/View/IntensityDataWidgets/ScientificPlot.h"
#include <QMap>
@@ -106,4 +106,4 @@ private:
bool m_block_update;
};
-#endif // BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAP_H
+#endif // BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_COLORMAP_H
diff --git a/GUI/View/IntensityDataWidgets/ColorMapCanvas.h b/GUI/View/IntensityDataWidgets/ColorMapCanvas.h
index 94a486d8d6caec5faa1dda7dc8888a5f3e9dbc01..77eb352fcfc3b6f18b9569d219ab2bbdf8444d9a 100644
--- a/GUI/View/IntensityDataWidgets/ColorMapCanvas.h
+++ b/GUI/View/IntensityDataWidgets/ColorMapCanvas.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPCANVAS_H
-#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPCANVAS_H
+#ifndef BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_COLORMAPCANVAS_H
+#define BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_COLORMAPCANVAS_H
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -49,4 +49,4 @@ private:
PlotStatusLabel* m_statusLabel;
};
-#endif // BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPCANVAS_H
+#endif // BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_COLORMAPCANVAS_H
diff --git a/GUI/View/IntensityDataWidgets/ColorMapUtils.h b/GUI/View/IntensityDataWidgets/ColorMapUtils.h
index bb078c3f11c65de72044774aaf8f6c9de5d46279..7e3595ac261f449cf68d92cd9e6501be722cae63 100644
--- a/GUI/View/IntensityDataWidgets/ColorMapUtils.h
+++ b/GUI/View/IntensityDataWidgets/ColorMapUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPUTILS_H
-#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_COLORMAPUTILS_H
+#define BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_COLORMAPUTILS_H
#include <QMap>
#include <QMargins>
@@ -56,4 +56,4 @@ void setDefaultMargins(QCustomPlot* customPlot);
} // namespace GUI::View::ColorMapUtils
-#endif // BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_COLORMAPUTILS_H
diff --git a/GUI/View/IntensityDataWidgets/FontScalingEvent.h b/GUI/View/IntensityDataWidgets/FontScalingEvent.h
index 441b87d63c9b31214ff495810150c2bb160b4d29..ffac46f8d730631b8582b1697427a26bf4ef8b08 100644
--- a/GUI/View/IntensityDataWidgets/FontScalingEvent.h
+++ b/GUI/View/IntensityDataWidgets/FontScalingEvent.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_FONTSCALINGEVENT_H
-#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_FONTSCALINGEVENT_H
+#ifndef BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_FONTSCALINGEVENT_H
+#define BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_FONTSCALINGEVENT_H
#include <QFont>
#include <QMap>
@@ -44,4 +44,4 @@ private:
QMap<QString, QFont> m_fonts;
};
-#endif // BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_FONTSCALINGEVENT_H
+#endif // BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_FONTSCALINGEVENT_H
diff --git a/GUI/View/IntensityDataWidgets/IntensityDataCanvas.h b/GUI/View/IntensityDataWidgets/IntensityDataCanvas.h
index e3365e5050a49d4ef2221e8c4bd0e3697dd4d5dc..b00f2bc7f8203791dfbd6a0e970c12a17e0ebfb8 100644
--- a/GUI/View/IntensityDataWidgets/IntensityDataCanvas.h
+++ b/GUI/View/IntensityDataWidgets/IntensityDataCanvas.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATACANVAS_H
-#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATACANVAS_H
+#ifndef BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_INTENSITYDATACANVAS_H
+#define BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_INTENSITYDATACANVAS_H
#include "Device/Data/OutputData.h"
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -60,4 +60,4 @@ private:
QAction* m_savePlotAction;
};
-#endif // BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATACANVAS_H
+#endif // BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_INTENSITYDATACANVAS_H
diff --git a/GUI/View/IntensityDataWidgets/IntensityDataFFTPresenter.h b/GUI/View/IntensityDataWidgets/IntensityDataFFTPresenter.h
index 7f0f0c02b6f8c933fe6a91732ef62742bd502a0e..eea7a876c8897d95618cc81d2dd9f068b73a3fae 100644
--- a/GUI/View/IntensityDataWidgets/IntensityDataFFTPresenter.h
+++ b/GUI/View/IntensityDataWidgets/IntensityDataFFTPresenter.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAFFTPRESENTER_H
-#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAFFTPRESENTER_H
+#ifndef BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_INTENSITYDATAFFTPRESENTER_H
+#define BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_INTENSITYDATAFFTPRESENTER_H
#include <QObject>
@@ -51,4 +51,4 @@ private:
bool m_in_fft_mode;
};
-#endif // BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAFFTPRESENTER_H
+#endif // BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_INTENSITYDATAFFTPRESENTER_H
diff --git a/GUI/View/IntensityDataWidgets/IntensityDataPropertyWidget.h b/GUI/View/IntensityDataWidgets/IntensityDataPropertyWidget.h
index 84741e7fd9da1b2bbc3f8380301b066280f86aa6..c785ea5676e3a0713940793720078ce69d99268e 100644
--- a/GUI/View/IntensityDataWidgets/IntensityDataPropertyWidget.h
+++ b/GUI/View/IntensityDataWidgets/IntensityDataPropertyWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAPROPERTYWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAPROPERTYWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_INTENSITYDATAPROPERTYWIDGET_H
+#define BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_INTENSITYDATAPROPERTYWIDGET_H
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -46,4 +46,4 @@ private:
ComponentEditor* m_componentEditor;
};
-#endif // BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAPROPERTYWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_INTENSITYDATAPROPERTYWIDGET_H
diff --git a/GUI/View/IntensityDataWidgets/IntensityDataWidget.h b/GUI/View/IntensityDataWidgets/IntensityDataWidget.h
index 8d9e01b957ee54b597ccd3322b831348954b5b1b..89b71b2b473bd007804b6a475e338ccc94924c22 100644
--- a/GUI/View/IntensityDataWidgets/IntensityDataWidget.h
+++ b/GUI/View/IntensityDataWidgets/IntensityDataWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_INTENSITYDATAWIDGET_H
+#define BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_INTENSITYDATAWIDGET_H
#include "GUI/Widget/Common/SessionItemWidget.h"
#include <memory>
@@ -51,4 +51,4 @@ private:
IntensityDataFFTPresenter* m_fftPresenter;
};
-#endif // BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_INTENSITYDATAWIDGET_H
diff --git a/GUI/View/IntensityDataWidgets/Plot1D.h b/GUI/View/IntensityDataWidgets/Plot1D.h
index 487bc11596f228e8afc240cd15e7b8f7e683a2c8..51a97430d9f9b99b29483cf0b870ba579b1b24c5 100644
--- a/GUI/View/IntensityDataWidgets/Plot1D.h
+++ b/GUI/View/IntensityDataWidgets/Plot1D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOT1D_H
-#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOT1D_H
+#ifndef BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_PLOT1D_H
+#define BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_PLOT1D_H
#include "GUI/View/IntensityDataWidgets/ScientificPlot.h"
#include <qcustomplot.h>
@@ -112,4 +112,4 @@ private:
bool m_block_update;
};
-#endif // BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOT1D_H
+#endif // BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_PLOT1D_H
diff --git a/GUI/View/IntensityDataWidgets/PlotConstants.h b/GUI/View/IntensityDataWidgets/PlotConstants.h
index d6548440cd085149d1e5786a4a3d8e7d879cb6ce..7c2f5cfc28b9b710c3ff2a3fbe2542c2a0d8b549 100644
--- a/GUI/View/IntensityDataWidgets/PlotConstants.h
+++ b/GUI/View/IntensityDataWidgets/PlotConstants.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOTCONSTANTS_H
-#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOTCONSTANTS_H
+#ifndef BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_PLOTCONSTANTS_H
+#define BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_PLOTCONSTANTS_H
#include "GUI/Widget/Common/StyleUtils.h"
#include <QSize>
@@ -37,4 +37,4 @@ inline int plot_colorbar_size()
} // namespace GUI::Constants
-#endif // BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOTCONSTANTS_H
+#endif // BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_PLOTCONSTANTS_H
diff --git a/GUI/View/IntensityDataWidgets/PlotEventInfo.h b/GUI/View/IntensityDataWidgets/PlotEventInfo.h
index 6545ba3aef19921eb3aa7127aad3ef2425a19f7d..615415c522d02ca83b117ef1903c5c0f88e83000 100644
--- a/GUI/View/IntensityDataWidgets/PlotEventInfo.h
+++ b/GUI/View/IntensityDataWidgets/PlotEventInfo.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOTEVENTINFO_H
-#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOTEVENTINFO_H
+#ifndef BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_PLOTEVENTINFO_H
+#define BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_PLOTEVENTINFO_H
#include "GUI/View/IntensityDataWidgets/ScientificPlot.h"
#include <QString>
@@ -60,4 +60,4 @@ private:
PLOT_TYPE m_info_type;
};
-#endif // BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOTEVENTINFO_H
+#endif // BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_PLOTEVENTINFO_H
diff --git a/GUI/View/IntensityDataWidgets/PlotStatusLabel.h b/GUI/View/IntensityDataWidgets/PlotStatusLabel.h
index cb41dfba17db58eaf646dc148763bbc638537f3c..cb5d1496853b94149f466263d7fd1924c58921af 100644
--- a/GUI/View/IntensityDataWidgets/PlotStatusLabel.h
+++ b/GUI/View/IntensityDataWidgets/PlotStatusLabel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOTSTATUSLABEL_H
-#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOTSTATUSLABEL_H
+#ifndef BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_PLOTSTATUSLABEL_H
+#define BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_PLOTSTATUSLABEL_H
#include "GUI/Widget/Common/StatusLabel.h"
#include <QList>
@@ -50,4 +50,4 @@ private:
QList<ScientificPlot*> m_plots;
};
-#endif // BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PLOTSTATUSLABEL_H
+#endif // BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_PLOTSTATUSLABEL_H
diff --git a/GUI/View/IntensityDataWidgets/PropertyRepeater.h b/GUI/View/IntensityDataWidgets/PropertyRepeater.h
index 3bdd4e3f75ee6109f04e78f737308f198c0cdf3f..1521b1a8c5c1669e1ff058c62bdb99e9e687b076 100644
--- a/GUI/View/IntensityDataWidgets/PropertyRepeater.h
+++ b/GUI/View/IntensityDataWidgets/PropertyRepeater.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PROPERTYREPEATER_H
-#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PROPERTYREPEATER_H
+#ifndef BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_PROPERTYREPEATER_H
+#define BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_PROPERTYREPEATER_H
#include <QMap>
#include <QObject>
@@ -46,4 +46,4 @@ private:
bool m_repeat_child_properties;
};
-#endif // BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_PROPERTYREPEATER_H
+#endif // BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_PROPERTYREPEATER_H
diff --git a/GUI/View/IntensityDataWidgets/SavePlotAssistant.h b/GUI/View/IntensityDataWidgets/SavePlotAssistant.h
index 104031743e9395d929afaaf811ed4737e561e8de..f28f6b9659294890929d434589bd51fcb03d5dec 100644
--- a/GUI/View/IntensityDataWidgets/SavePlotAssistant.h
+++ b/GUI/View/IntensityDataWidgets/SavePlotAssistant.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_SAVEPLOTASSISTANT_H
-#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_SAVEPLOTASSISTANT_H
+#ifndef BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_SAVEPLOTASSISTANT_H
+#define BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_SAVEPLOTASSISTANT_H
#include <QString>
#include <QVector>
@@ -48,4 +48,4 @@ private:
static QVector<Format> m_formats;
};
-#endif // BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_SAVEPLOTASSISTANT_H
+#endif // BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_SAVEPLOTASSISTANT_H
diff --git a/GUI/View/IntensityDataWidgets/ScientificPlot.h b/GUI/View/IntensityDataWidgets/ScientificPlot.h
index c03feae9d225e94d6270374db22986557a1c6137..c1e808f78b07c89e2fb7f61deaefeb0f31d088ed 100644
--- a/GUI/View/IntensityDataWidgets/ScientificPlot.h
+++ b/GUI/View/IntensityDataWidgets/ScientificPlot.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOT_H
-#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOT_H
+#ifndef BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_SCIENTIFICPLOT_H
+#define BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_SCIENTIFICPLOT_H
#include "GUI/Widget/Common/SessionItemWidget.h"
#include <memory>
@@ -66,4 +66,4 @@ private:
ScientificPlotEvent* m_event;
};
-#endif // BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOT_H
+#endif // BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_SCIENTIFICPLOT_H
diff --git a/GUI/View/IntensityDataWidgets/ScientificPlotEvent.h b/GUI/View/IntensityDataWidgets/ScientificPlotEvent.h
index 7a521742981bb66cf266cf6c491d0f2fb1eb0763..684eec0145e70dc290bf951f7cdf1b7e6e21d197 100644
--- a/GUI/View/IntensityDataWidgets/ScientificPlotEvent.h
+++ b/GUI/View/IntensityDataWidgets/ScientificPlotEvent.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOTEVENT_H
-#define BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOTEVENT_H
+#ifndef BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_SCIENTIFICPLOTEVENT_H
+#define BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_SCIENTIFICPLOTEVENT_H
#include "GUI/View/IntensityDataWidgets/PlotEventInfo.h"
#include <QObject>
@@ -53,4 +53,4 @@ private:
PlotEventInfo m_prevPos;
};
-#endif // BORNAGAIN_GUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOTEVENT_H
+#endif // BORNAGAIN_GUI_VIEW_INTENSITYDATAWIDGETS_SCIENTIFICPLOTEVENT_H
diff --git a/GUI/View/JobWidgets/FitComparisonController.h b/GUI/View/JobWidgets/FitComparisonController.h
index eeca1e03a583765abcdda394d01c3cfd80a4efd5..8f2ace3a8135caf15c1cea484224d7faa64ea45c 100644
--- a/GUI/View/JobWidgets/FitComparisonController.h
+++ b/GUI/View/JobWidgets/FitComparisonController.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONCONTROLLER_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONCONTROLLER_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_FITCOMPARISONCONTROLLER_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_FITCOMPARISONCONTROLLER_H
#include <QObject>
@@ -49,4 +49,4 @@ private:
PropertyRepeater* m_zAxisRepeater;
};
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONCONTROLLER_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_FITCOMPARISONCONTROLLER_H
diff --git a/GUI/View/JobWidgets/FitComparisonViewController.h b/GUI/View/JobWidgets/FitComparisonViewController.h
index ce63f3feb23cbd197ebaf042299e5d681f7ed410..b0ebb93bf1a10695ba58f75c7d463d03d13ccfef 100644
--- a/GUI/View/JobWidgets/FitComparisonViewController.h
+++ b/GUI/View/JobWidgets/FitComparisonViewController.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONVIEWCONTROLLER_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONVIEWCONTROLLER_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_FITCOMPARISONVIEWCONTROLLER_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_FITCOMPARISONVIEWCONTROLLER_H
#include <QObject>
@@ -63,4 +63,4 @@ private:
PropertyRepeater* m_xAxisRepeater;
};
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONVIEWCONTROLLER_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_FITCOMPARISONVIEWCONTROLLER_H
diff --git a/GUI/View/JobWidgets/FitComparisonWidget.h b/GUI/View/JobWidgets/FitComparisonWidget.h
index 53f53b94c0905c0d8c1dd1318e60fd7bf8f53ac9..4b9e2927a103f5b60d2bb0f5886f955a56c27180 100644
--- a/GUI/View/JobWidgets/FitComparisonWidget.h
+++ b/GUI/View/JobWidgets/FitComparisonWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_FITCOMPARISONWIDGET_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_FITCOMPARISONWIDGET_H
#include "GUI/Widget/Common/SessionItemWidget.h"
#include <QMap>
@@ -65,4 +65,4 @@ private:
FitComparisonController2D* m_comparisonController;
};
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_FITCOMPARISONWIDGET_H
diff --git a/GUI/View/JobWidgets/FitComparisonWidget1D.h b/GUI/View/JobWidgets/FitComparisonWidget1D.h
index fd5e496341746dbef2d48e60656dc72479f40dd8..fc4c67d833f2462def5b72d7b5f3f7ca4197faf9 100644
--- a/GUI/View/JobWidgets/FitComparisonWidget1D.h
+++ b/GUI/View/JobWidgets/FitComparisonWidget1D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET1D_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET1D_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_FITCOMPARISONWIDGET1D_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_FITCOMPARISONWIDGET1D_H
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -58,4 +58,4 @@ private:
FitComparison1DViewController* m_comparisonController;
};
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET1D_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_FITCOMPARISONWIDGET1D_H
diff --git a/GUI/View/JobWidgets/FitFlowWidget.h b/GUI/View/JobWidgets/FitFlowWidget.h
index e3d6fa31515a3d693b0608a303c79bee5e97aebb..85f11e1563aede039a95353394031c28ce7c4f90 100644
--- a/GUI/View/JobWidgets/FitFlowWidget.h
+++ b/GUI/View/JobWidgets/FitFlowWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITFLOWWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITFLOWWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_FITFLOWWIDGET_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_FITFLOWWIDGET_H
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -40,4 +40,4 @@ private:
QVector<double> m_y;
};
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITFLOWWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_FITFLOWWIDGET_H
diff --git a/GUI/View/JobWidgets/HistogramPlot.h b/GUI/View/JobWidgets/HistogramPlot.h
index 98305ba43fe77f669e805ed370b3b63764887ce6..5b2fa15555253b1199ce9739141829f94c31af48 100644
--- a/GUI/View/JobWidgets/HistogramPlot.h
+++ b/GUI/View/JobWidgets/HistogramPlot.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_HISTOGRAMPLOT_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_HISTOGRAMPLOT_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_HISTOGRAMPLOT_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_HISTOGRAMPLOT_H
#include <QWidget>
#include <qcustomplot.h>
@@ -35,4 +35,4 @@ private:
QCustomPlot* m_customPlot;
};
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_HISTOGRAMPLOT_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_HISTOGRAMPLOT_H
diff --git a/GUI/View/JobWidgets/JobListModel.h b/GUI/View/JobWidgets/JobListModel.h
index e54b565daf8a36d4ddcec4fc4f2303b7a6ebc302..04037c612df535c46e70b4b9a77d65b82b7d6bed 100644
--- a/GUI/View/JobWidgets/JobListModel.h
+++ b/GUI/View/JobWidgets/JobListModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBLISTMODEL_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBLISTMODEL_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBLISTMODEL_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBLISTMODEL_H
#include <QAbstractListModel>
@@ -51,4 +51,4 @@ private:
JobModel* m_jobs;
};
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBLISTMODEL_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBLISTMODEL_H
diff --git a/GUI/View/JobWidgets/JobListView.h b/GUI/View/JobWidgets/JobListView.h
index 74f094a045caea9cc82f286b369ffa2cd702c0ab..0176bc6c93dab6e47a92ed753130438e1d679563 100644
--- a/GUI/View/JobWidgets/JobListView.h
+++ b/GUI/View/JobWidgets/JobListView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBLISTVIEW_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBLISTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBLISTVIEW_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBLISTVIEW_H
#include <QWidget>
@@ -61,4 +61,4 @@ private:
QMenu* m_equalizeMenu;
};
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBLISTVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBLISTVIEW_H
diff --git a/GUI/View/JobWidgets/JobListViewDelegate.h b/GUI/View/JobWidgets/JobListViewDelegate.h
index d1b24c6f9d41916a5df59ffb98b104fc1217d95e..6bee868eb47733511e4e7c7ea7b45d7015fa3665 100644
--- a/GUI/View/JobWidgets/JobListViewDelegate.h
+++ b/GUI/View/JobWidgets/JobListViewDelegate.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBLISTVIEWDELEGATE_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBLISTVIEWDELEGATE_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBLISTVIEWDELEGATE_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBLISTVIEWDELEGATE_H
#include <QItemDelegate>
#include <QMap>
@@ -49,4 +49,4 @@ private:
QMap<JobStatus, QColor> m_status_to_color;
};
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBLISTVIEWDELEGATE_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBLISTVIEWDELEGATE_H
diff --git a/GUI/View/JobWidgets/JobMessagePanel.h b/GUI/View/JobWidgets/JobMessagePanel.h
index 863d7ff7a5d597498bf9b22fc6783a62222b9bee..d4977b3b82c69a95c51660b3eedb4357f6e9afd5 100644
--- a/GUI/View/JobWidgets/JobMessagePanel.h
+++ b/GUI/View/JobWidgets/JobMessagePanel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBMESSAGEPANEL_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBMESSAGEPANEL_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBMESSAGEPANEL_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBMESSAGEPANEL_H
#include "GUI/View/FitWidgets/FitLog.h"
#include "GUI/Widget/Common/InfoPanel.h"
@@ -39,4 +39,4 @@ private:
QTextEdit* m_plainLog;
};
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBMESSAGEPANEL_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBMESSAGEPANEL_H
diff --git a/GUI/View/JobWidgets/JobProgressAssistant.h b/GUI/View/JobWidgets/JobProgressAssistant.h
index 89db3d674e6ab0ae15f73c6f08db21f34187914a..458a35cbd7a0ce50cd96a1ef8023f7816224dc9f 100644
--- a/GUI/View/JobWidgets/JobProgressAssistant.h
+++ b/GUI/View/JobWidgets/JobProgressAssistant.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBPROGRESSASSISTANT_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBPROGRESSASSISTANT_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBPROGRESSASSISTANT_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBPROGRESSASSISTANT_H
#include <QObject>
@@ -34,4 +34,4 @@ private:
MainWindow* m_mainWindow;
};
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBPROGRESSASSISTANT_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBPROGRESSASSISTANT_H
diff --git a/GUI/View/JobWidgets/JobPropertiesTableModel.h b/GUI/View/JobWidgets/JobPropertiesTableModel.h
index b0785977100c1eb2abedadfef32743973764a71a..f21e4aeb065604d6d80e6792e7567be055fb1af5 100644
--- a/GUI/View/JobWidgets/JobPropertiesTableModel.h
+++ b/GUI/View/JobWidgets/JobPropertiesTableModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBPROPERTIESTABLEMODEL_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBPROPERTIESTABLEMODEL_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBPROPERTIESTABLEMODEL_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBPROPERTIESTABLEMODEL_H
#include <QAbstractTableModel>
@@ -45,4 +45,4 @@ private:
JobItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBPROPERTIESTABLEMODEL_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBPROPERTIESTABLEMODEL_H
diff --git a/GUI/View/JobWidgets/JobPropertiesWidget.h b/GUI/View/JobWidgets/JobPropertiesWidget.h
index feafb033ed0005002b14f3602869af028b8d0b21..7c6e4aad5533837ece4ccc8abeaef0ea90887b23 100644
--- a/GUI/View/JobWidgets/JobPropertiesWidget.h
+++ b/GUI/View/JobWidgets/JobPropertiesWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBPROPERTIESWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBPROPERTIESWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBPROPERTIESWIDGET_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBPROPERTIESWIDGET_H
#include <QWidget>
@@ -50,4 +50,4 @@ private:
JobItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBPROPERTIESWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBPROPERTIESWIDGET_H
diff --git a/GUI/View/JobWidgets/JobResultsPresenter.h b/GUI/View/JobWidgets/JobResultsPresenter.h
index 6f9718cbfce649fa5bd0cd77377fe5072a3e1408..1d486fbcaf486b29f2df74efc10e8f5fdf38441b 100644
--- a/GUI/View/JobWidgets/JobResultsPresenter.h
+++ b/GUI/View/JobWidgets/JobResultsPresenter.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBRESULTSPRESENTER_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBRESULTSPRESENTER_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBRESULTSPRESENTER_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBRESULTSPRESENTER_H
#include "GUI/Widget/Common/ItemComboWidget.h"
@@ -51,4 +51,4 @@ private:
JobViewActivity m_activity;
};
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBRESULTSPRESENTER_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBRESULTSPRESENTER_H
diff --git a/GUI/View/JobWidgets/JobSelectorWidget.h b/GUI/View/JobWidgets/JobSelectorWidget.h
index 8891332b29e18f8834066498c06a766335dfcd0c..e0d40b1eacb348f34b8df420e1bfebf097baeebb 100644
--- a/GUI/View/JobWidgets/JobSelectorWidget.h
+++ b/GUI/View/JobWidgets/JobSelectorWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBSELECTORWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBSELECTORWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBSELECTORWIDGET_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBSELECTORWIDGET_H
#include <QWidget>
@@ -47,4 +47,4 @@ private:
JobModel* m_jobModel;
};
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBSELECTORWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBSELECTORWIDGET_H
diff --git a/GUI/View/JobWidgets/JobView.h b/GUI/View/JobWidgets/JobView.h
index 89211fad5c02d45add40dfe0bec7511dd4fb8fdc..1fd0af0c02a395a12019a5a4338662112f6e7e45 100644
--- a/GUI/View/JobWidgets/JobView.h
+++ b/GUI/View/JobWidgets/JobView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBVIEW_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBVIEW_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBVIEW_H
#include <QActionGroup>
#include <QMainWindow>
@@ -75,4 +75,4 @@ private:
ProjectDocument* m_document;
};
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBVIEW_H
diff --git a/GUI/View/JobWidgets/JobViewActivities.h b/GUI/View/JobWidgets/JobViewActivities.h
index b1c6cf77fb617767f1e47304d3747faa026a11db..99cee6f576be6bd391b48838f3dbfb9eb1290410 100644
--- a/GUI/View/JobWidgets/JobViewActivities.h
+++ b/GUI/View/JobWidgets/JobViewActivities.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBVIEWACTIVITIES_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBVIEWACTIVITIES_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBVIEWACTIVITIES_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBVIEWACTIVITIES_H
#include "GUI/View/JobWidgets/JobViewFlags.h"
#include <QMap>
@@ -34,4 +34,4 @@ QVector<JobViewFlags::Dock> activeDocks(JobViewActivity activity);
}; // namespace JobViewActivities
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBVIEWACTIVITIES_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBVIEWACTIVITIES_H
diff --git a/GUI/View/JobWidgets/JobViewFlags.h b/GUI/View/JobWidgets/JobViewFlags.h
index 2bb470a5b55f60617ae4b92cafaf85fcceada742..ae7b5cd22c3ba14d14f9c3d3616d544aa1de806b 100644
--- a/GUI/View/JobWidgets/JobViewFlags.h
+++ b/GUI/View/JobWidgets/JobViewFlags.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBVIEWFLAGS_H
-#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBVIEWFLAGS_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBVIEWFLAGS_H
+#define BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBVIEWFLAGS_H
#include <QWidget>
@@ -32,4 +32,4 @@ public:
Q_DECLARE_OPERATORS_FOR_FLAGS(JobViewFlags::Dock)
-#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBVIEWFLAGS_H
+#endif // BORNAGAIN_GUI_VIEW_JOBWIDGETS_JOBVIEWFLAGS_H
diff --git a/GUI/View/Loaders/AutomaticDataLoader1D.h b/GUI/View/Loaders/AutomaticDataLoader1D.h
index a963dc52d9749a72466b719b785bd0423e994ae7..084abe27d23369310bce8bb286f831b55a93a081 100644
--- a/GUI/View/Loaders/AutomaticDataLoader1D.h
+++ b/GUI/View/Loaders/AutomaticDataLoader1D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_LOADERS_AUTOMATICDATALOADER1D_H
-#define BORNAGAIN_GUI_VIEWS_LOADERS_AUTOMATICDATALOADER1D_H
+#ifndef BORNAGAIN_GUI_VIEW_LOADERS_AUTOMATICDATALOADER1D_H
+#define BORNAGAIN_GUI_VIEW_LOADERS_AUTOMATICDATALOADER1D_H
#include "Device/Data/OutputData.h"
#include "GUI/Model/IO/AbstractDataLoader1D.h"
@@ -39,4 +39,4 @@ private:
QString m_error;
};
-#endif // BORNAGAIN_GUI_VIEWS_LOADERS_AUTOMATICDATALOADER1D_H
+#endif // BORNAGAIN_GUI_VIEW_LOADERS_AUTOMATICDATALOADER1D_H
diff --git a/GUI/View/Loaders/AutomaticDataLoader1DResultModel.h b/GUI/View/Loaders/AutomaticDataLoader1DResultModel.h
index 820d477373c165d2b993bfd04b8fdfc591f0130a..8ef6696949a16c2d81c9a6c8cbf45aa86c791577 100644
--- a/GUI/View/Loaders/AutomaticDataLoader1DResultModel.h
+++ b/GUI/View/Loaders/AutomaticDataLoader1DResultModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_LOADERS_AUTOMATICDATALOADER1DRESULTMODEL_H
-#define BORNAGAIN_GUI_VIEWS_LOADERS_AUTOMATICDATALOADER1DRESULTMODEL_H
+#ifndef BORNAGAIN_GUI_VIEW_LOADERS_AUTOMATICDATALOADER1DRESULTMODEL_H
+#define BORNAGAIN_GUI_VIEW_LOADERS_AUTOMATICDATALOADER1DRESULTMODEL_H
#include "GUI/Model/IO/AbstractDataLoaderResultModel.h"
@@ -40,4 +40,4 @@ private:
RealDataItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_LOADERS_AUTOMATICDATALOADER1DRESULTMODEL_H
+#endif // BORNAGAIN_GUI_VIEW_LOADERS_AUTOMATICDATALOADER1DRESULTMODEL_H
diff --git a/GUI/View/Loaders/DataLoaderUtil.h b/GUI/View/Loaders/DataLoaderUtil.h
index 59edf20e4844b167985106e5a207d0c45a4baf44..20da94e90a7c655a672587d81fd867e83ffe9677 100644
--- a/GUI/View/Loaders/DataLoaderUtil.h
+++ b/GUI/View/Loaders/DataLoaderUtil.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_LOADERS_DATALOADERUTIL_H
-#define BORNAGAIN_GUI_VIEWS_LOADERS_DATALOADERUTIL_H
+#ifndef BORNAGAIN_GUI_VIEW_LOADERS_DATALOADERUTIL_H
+#define BORNAGAIN_GUI_VIEW_LOADERS_DATALOADERUTIL_H
class AbstractDataLoader1D;
class QString;
@@ -24,4 +24,4 @@ void cloneAsUserDefinedLoader(AbstractDataLoader1D* loader, const QString& name)
//! register the concrete 1D data loaders with DataLoaders1D
void register1DDataLoaders();
-#endif // BORNAGAIN_GUI_VIEWS_LOADERS_DATALOADERUTIL_H
+#endif // BORNAGAIN_GUI_VIEW_LOADERS_DATALOADERUTIL_H
diff --git a/GUI/View/Loaders/QREDataLoader.h b/GUI/View/Loaders/QREDataLoader.h
index 56a84ade0ac390f1e2f4fb04f7ab12ee86821dba..1d0a7a81d3d20fd47a0118ecc94dec6c7ee143f8 100644
--- a/GUI/View/Loaders/QREDataLoader.h
+++ b/GUI/View/Loaders/QREDataLoader.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_LOADERS_QREDATALOADER_H
-#define BORNAGAIN_GUI_VIEWS_LOADERS_QREDATALOADER_H
+#ifndef BORNAGAIN_GUI_VIEW_LOADERS_QREDATALOADER_H
+#define BORNAGAIN_GUI_VIEW_LOADERS_QREDATALOADER_H
#include "GUI/Model/IO/AbstractDataLoader1D.h"
#include <QVector>
@@ -139,4 +139,4 @@ private:
QDataStream& operator<<(QDataStream& stream, const QREDataLoader::ImportSettings& s);
QDataStream& operator>>(QDataStream& stream, QREDataLoader::ImportSettings& s);
-#endif // BORNAGAIN_GUI_VIEWS_LOADERS_QREDATALOADER_H
+#endif // BORNAGAIN_GUI_VIEW_LOADERS_QREDATALOADER_H
diff --git a/GUI/View/Loaders/QREDataLoaderProperties.h b/GUI/View/Loaders/QREDataLoaderProperties.h
index 95e2d2fc9e9518822593ba6f31d7ca22beab0dc2..d13c489ed511a5841c8090d9e505738a97e217b5 100644
--- a/GUI/View/Loaders/QREDataLoaderProperties.h
+++ b/GUI/View/Loaders/QREDataLoaderProperties.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_LOADERS_QREDATALOADERPROPERTIES_H
-#define BORNAGAIN_GUI_VIEWS_LOADERS_QREDATALOADERPROPERTIES_H
+#ifndef BORNAGAIN_GUI_VIEW_LOADERS_QREDATALOADERPROPERTIES_H
+#define BORNAGAIN_GUI_VIEW_LOADERS_QREDATALOADERPROPERTIES_H
#include <QWidget>
@@ -62,4 +62,4 @@ private:
static const int factorColumn = factorLabelColumn + 1;
};
-#endif // BORNAGAIN_GUI_VIEWS_LOADERS_QREDATALOADERPROPERTIES_H
+#endif // BORNAGAIN_GUI_VIEW_LOADERS_QREDATALOADERPROPERTIES_H
diff --git a/GUI/View/Loaders/QREDataLoaderResultModel.h b/GUI/View/Loaders/QREDataLoaderResultModel.h
index b9d321b48e925b9b82c4307c7b54c0f86fa65d85..e5bbd679b671cc3dada32755e14e200362302266 100644
--- a/GUI/View/Loaders/QREDataLoaderResultModel.h
+++ b/GUI/View/Loaders/QREDataLoaderResultModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_LOADERS_QREDATALOADERRESULTMODEL_H
-#define BORNAGAIN_GUI_VIEWS_LOADERS_QREDATALOADERRESULTMODEL_H
+#ifndef BORNAGAIN_GUI_VIEW_LOADERS_QREDATALOADERRESULTMODEL_H
+#define BORNAGAIN_GUI_VIEW_LOADERS_QREDATALOADERRESULTMODEL_H
#include "GUI/Model/IO/AbstractDataLoaderResultModel.h"
#include "GUI/View/Loaders/QREDataLoader.h"
@@ -39,4 +39,4 @@ private:
QREDataLoader::ImportResult* m_importResult;
};
-#endif // BORNAGAIN_GUI_VIEWS_LOADERS_QREDATALOADERRESULTMODEL_H
+#endif // BORNAGAIN_GUI_VIEW_LOADERS_QREDATALOADERRESULTMODEL_H
diff --git a/GUI/View/Loaders/UserDefinedDataLoader1D.h b/GUI/View/Loaders/UserDefinedDataLoader1D.h
index 1f1660fe10eec625fe84811f2b56b69fbe2e74bc..269ca41ea473a9a29bd80baa2f7300d349729efb 100644
--- a/GUI/View/Loaders/UserDefinedDataLoader1D.h
+++ b/GUI/View/Loaders/UserDefinedDataLoader1D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_LOADERS_USERDEFINEDDATALOADER1D_H
-#define BORNAGAIN_GUI_VIEWS_LOADERS_USERDEFINEDDATALOADER1D_H
+#ifndef BORNAGAIN_GUI_VIEW_LOADERS_USERDEFINEDDATALOADER1D_H
+#define BORNAGAIN_GUI_VIEW_LOADERS_USERDEFINEDDATALOADER1D_H
#include "GUI/Model/IO/AbstractDataLoader1D.h"
@@ -43,4 +43,4 @@ private:
QByteArray m_defaultProperties;
};
-#endif // BORNAGAIN_GUI_VIEWS_LOADERS_USERDEFINEDDATALOADER1D_H
+#endif // BORNAGAIN_GUI_VIEW_LOADERS_USERDEFINEDDATALOADER1D_H
diff --git a/GUI/View/Main/AboutDialog.h b/GUI/View/Main/AboutDialog.h
index 00ffeb22b96bb5bccdefcffb5f65fccaf6948d48..8fba7b885e84ea4f348190d68c9b9abeab03e8eb 100644
--- a/GUI/View/Main/AboutDialog.h
+++ b/GUI/View/Main/AboutDialog.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MAIN_ABOUTDIALOG_H
-#define BORNAGAIN_GUI_VIEWS_MAIN_ABOUTDIALOG_H
+#ifndef BORNAGAIN_GUI_VIEW_MAIN_ABOUTDIALOG_H
+#define BORNAGAIN_GUI_VIEW_MAIN_ABOUTDIALOG_H
#include <QDialog>
@@ -32,4 +32,4 @@ private:
QBoxLayout* createButtonLayout();
};
-#endif // BORNAGAIN_GUI_VIEWS_MAIN_ABOUTDIALOG_H
+#endif // BORNAGAIN_GUI_VIEW_MAIN_ABOUTDIALOG_H
diff --git a/GUI/View/Main/ActionManager.h b/GUI/View/Main/ActionManager.h
index b7ba1d95a655294d172f25adab7ad3dba50190e2..5511848037ebf76713086c72b661c0950c305667 100644
--- a/GUI/View/Main/ActionManager.h
+++ b/GUI/View/Main/ActionManager.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MAIN_ACTIONMANAGER_H
-#define BORNAGAIN_GUI_VIEWS_MAIN_ACTIONMANAGER_H
+#ifndef BORNAGAIN_GUI_VIEW_MAIN_ACTIONMANAGER_H
+#define BORNAGAIN_GUI_VIEW_MAIN_ACTIONMANAGER_H
#include <QObject>
@@ -71,4 +71,4 @@ private:
void createGlobalShortcuts();
};
-#endif // BORNAGAIN_GUI_VIEWS_MAIN_ACTIONMANAGER_H
+#endif // BORNAGAIN_GUI_VIEW_MAIN_ACTIONMANAGER_H
diff --git a/GUI/View/Main/AutosaveController.h b/GUI/View/Main/AutosaveController.h
index 08fd4fd6fbea11796274fedaee3208cd20e2a72f..777bb5b5e10d49ad3d0c5dc35816c56361a1c99d 100644
--- a/GUI/View/Main/AutosaveController.h
+++ b/GUI/View/Main/AutosaveController.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MAIN_AUTOSAVECONTROLLER_H
-#define BORNAGAIN_GUI_VIEWS_MAIN_AUTOSAVECONTROLLER_H
+#ifndef BORNAGAIN_GUI_VIEW_MAIN_AUTOSAVECONTROLLER_H
+#define BORNAGAIN_GUI_VIEW_MAIN_AUTOSAVECONTROLLER_H
#include <QObject>
@@ -59,4 +59,4 @@ private:
UpdateTimer* m_timer;
};
-#endif // BORNAGAIN_GUI_VIEWS_MAIN_AUTOSAVECONTROLLER_H
+#endif // BORNAGAIN_GUI_VIEW_MAIN_AUTOSAVECONTROLLER_H
diff --git a/GUI/View/Main/MainWindow.h b/GUI/View/Main/MainWindow.h
index 870adda05a152df179b179ae0632220da0f9b5ef..f356f77d160d4787cc5d7875ca2ba590064aed1e 100644
--- a/GUI/View/Main/MainWindow.h
+++ b/GUI/View/Main/MainWindow.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MAIN_MAINWINDOW_H
-#define BORNAGAIN_GUI_VIEWS_MAIN_MAINWINDOW_H
+#ifndef BORNAGAIN_GUI_VIEW_MAIN_MAINWINDOW_H
+#define BORNAGAIN_GUI_VIEW_MAIN_MAINWINDOW_H
#include <QMainWindow>
@@ -113,4 +113,4 @@ private:
#define baWin (MainWindow::instance())
-#endif // BORNAGAIN_GUI_VIEWS_MAIN_MAINWINDOW_H
+#endif // BORNAGAIN_GUI_VIEW_MAIN_MAINWINDOW_H
diff --git a/GUI/View/Main/NewProjectDialog.h b/GUI/View/Main/NewProjectDialog.h
index 64c83fa5c3443d3e95a0f9a71eedceac45d36e20..ebab71526228fc2a4bf0c2981b8ee5d6fc99cead 100644
--- a/GUI/View/Main/NewProjectDialog.h
+++ b/GUI/View/Main/NewProjectDialog.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MAIN_NEWPROJECTDIALOG_H
-#define BORNAGAIN_GUI_VIEWS_MAIN_NEWPROJECTDIALOG_H
+#ifndef BORNAGAIN_GUI_VIEW_MAIN_NEWPROJECTDIALOG_H
+#define BORNAGAIN_GUI_VIEW_MAIN_NEWPROJECTDIALOG_H
#include <QDialog>
#include <QLineEdit>
@@ -56,4 +56,4 @@ private:
bool m_valid_projectPath;
};
-#endif // BORNAGAIN_GUI_VIEWS_MAIN_NEWPROJECTDIALOG_H
+#endif // BORNAGAIN_GUI_VIEW_MAIN_NEWPROJECTDIALOG_H
diff --git a/GUI/View/Main/ProjectManager.h b/GUI/View/Main/ProjectManager.h
index 2654a9b9189b31c9e859a446d842e16a056639a1..0f6f69078ea1cbfb071373081cbc3611e47b6be9 100644
--- a/GUI/View/Main/ProjectManager.h
+++ b/GUI/View/Main/ProjectManager.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MAIN_PROJECTMANAGER_H
-#define BORNAGAIN_GUI_VIEWS_MAIN_PROJECTMANAGER_H
+#ifndef BORNAGAIN_GUI_VIEW_MAIN_PROJECTMANAGER_H
+#define BORNAGAIN_GUI_VIEW_MAIN_PROJECTMANAGER_H
#include "GUI/Model/Project/ProjectDocument.h"
#include <QObject>
@@ -99,4 +99,4 @@ private:
static ProjectManager* s_instance;
};
-#endif // BORNAGAIN_GUI_VIEWS_MAIN_PROJECTMANAGER_H
+#endif // BORNAGAIN_GUI_VIEW_MAIN_PROJECTMANAGER_H
diff --git a/GUI/View/Main/PyImportAssistant.h b/GUI/View/Main/PyImportAssistant.h
index fd093ab6057f381736c1ce837b4bc0fd0ba39163..5d0e564ffc5f765f93a00c82e4360b3601318886 100644
--- a/GUI/View/Main/PyImportAssistant.h
+++ b/GUI/View/Main/PyImportAssistant.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MAIN_PYIMPORTASSISTANT_H
-#define BORNAGAIN_GUI_VIEWS_MAIN_PYIMPORTASSISTANT_H
+#ifndef BORNAGAIN_GUI_VIEW_MAIN_PYIMPORTASSISTANT_H
+#define BORNAGAIN_GUI_VIEW_MAIN_PYIMPORTASSISTANT_H
#ifdef BORNAGAIN_PYTHON
@@ -47,4 +47,4 @@ private:
#endif // BORNAGAIN_PYTHON
-#endif // BORNAGAIN_GUI_VIEWS_MAIN_PYIMPORTASSISTANT_H
+#endif // BORNAGAIN_GUI_VIEW_MAIN_PYIMPORTASSISTANT_H
diff --git a/GUI/View/Main/SaveService.h b/GUI/View/Main/SaveService.h
index a1e20d395399656d0fedc827daa8d229fc9e0127..d345d30ece58bb294ac49a4c0cfc75f109cd19a1 100644
--- a/GUI/View/Main/SaveService.h
+++ b/GUI/View/Main/SaveService.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MAIN_SAVESERVICE_H
-#define BORNAGAIN_GUI_VIEWS_MAIN_SAVESERVICE_H
+#ifndef BORNAGAIN_GUI_VIEW_MAIN_SAVESERVICE_H
+#define BORNAGAIN_GUI_VIEW_MAIN_SAVESERVICE_H
#include <QObject>
#include <QQueue>
@@ -61,4 +61,4 @@ private:
ProjectDocument* m_document;
};
-#endif // BORNAGAIN_GUI_VIEWS_MAIN_SAVESERVICE_H
+#endif // BORNAGAIN_GUI_VIEW_MAIN_SAVESERVICE_H
diff --git a/GUI/View/Main/SaveThread.h b/GUI/View/Main/SaveThread.h
index 80da903c42e5806fb84367ae8a4e3a9c20601170..83202ea9b0724d5c353843fa10dc2d15b38d80cb 100644
--- a/GUI/View/Main/SaveThread.h
+++ b/GUI/View/Main/SaveThread.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MAIN_SAVETHREAD_H
-#define BORNAGAIN_GUI_VIEWS_MAIN_SAVETHREAD_H
+#ifndef BORNAGAIN_GUI_VIEW_MAIN_SAVETHREAD_H
+#define BORNAGAIN_GUI_VIEW_MAIN_SAVETHREAD_H
#include <QObject>
#include <QThread>
@@ -40,4 +40,4 @@ private:
QString m_projectFile;
};
-#endif // BORNAGAIN_GUI_VIEWS_MAIN_SAVETHREAD_H
+#endif // BORNAGAIN_GUI_VIEW_MAIN_SAVETHREAD_H
diff --git a/GUI/View/MaskWidgets/ColorMapSceneAdaptor.h b/GUI/View/MaskWidgets/ColorMapSceneAdaptor.h
index 4bb85b44693b622ef8d8d2313980b467ace982fd..1bdd2e5ecfeb1e1462a7c8f5a18ac02b17bed007 100644
--- a/GUI/View/MaskWidgets/ColorMapSceneAdaptor.h
+++ b/GUI/View/MaskWidgets/ColorMapSceneAdaptor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_COLORMAPSCENEADAPTOR_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_COLORMAPSCENEADAPTOR_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_COLORMAPSCENEADAPTOR_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_COLORMAPSCENEADAPTOR_H
#include "GUI/View/MaskWidgets/ISceneAdaptor.h"
class ColorMap;
@@ -42,4 +42,4 @@ private:
ColorMap* m_plot;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_COLORMAPSCENEADAPTOR_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_COLORMAPSCENEADAPTOR_H
diff --git a/GUI/View/MaskWidgets/EllipseView.h b/GUI/View/MaskWidgets/EllipseView.h
index fb76d2302ddbd6e458d6b0e542a8910bf6995fe5..7ae9c2cdb0d566b089472ab6a86bb8fc1eff2ccf 100644
--- a/GUI/View/MaskWidgets/EllipseView.h
+++ b/GUI/View/MaskWidgets/EllipseView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_ELLIPSEVIEW_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_ELLIPSEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_ELLIPSEVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_ELLIPSEVIEW_H
#include "GUI/View/MaskWidgets/RectangleBaseView.h"
@@ -55,4 +55,4 @@ private:
EllipseItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_ELLIPSEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_ELLIPSEVIEW_H
diff --git a/GUI/View/MaskWidgets/ISceneAdaptor.h b/GUI/View/MaskWidgets/ISceneAdaptor.h
index a13bc3da597e538b12d40af085ce027b76b68f51..c4665cf48966e3e55f1e0fd4e7b179c824b0aa0d 100644
--- a/GUI/View/MaskWidgets/ISceneAdaptor.h
+++ b/GUI/View/MaskWidgets/ISceneAdaptor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_ISCENEADAPTOR_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_ISCENEADAPTOR_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_ISCENEADAPTOR_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_ISCENEADAPTOR_H
#include <QObject>
#include <QRectF>
@@ -55,4 +55,4 @@ public:
qreal fromSceneY(qreal value) const { return value; }
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_ISCENEADAPTOR_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_ISCENEADAPTOR_H
diff --git a/GUI/View/MaskWidgets/IShape2DView.h b/GUI/View/MaskWidgets/IShape2DView.h
index 96d6c1effb14e0cffa67de570d9989a5b3c36aa8..b6e86d3b7b2e98b0b36b1607df5960f40e552495 100644
--- a/GUI/View/MaskWidgets/IShape2DView.h
+++ b/GUI/View/MaskWidgets/IShape2DView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_ISHAPE2DVIEW_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_ISHAPE2DVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_ISHAPE2DVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_ISHAPE2DVIEW_H
#include "GUI/View/MaskWidgets/MaskEditorHelper.h"
#include <QGraphicsObject>
@@ -73,4 +73,4 @@ private:
virtual void onItemDestroyed() = 0;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_ISHAPE2DVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_ISHAPE2DVIEW_H
diff --git a/GUI/View/MaskWidgets/LineViews.h b/GUI/View/MaskWidgets/LineViews.h
index 7b34274f8021c358e87de1f31ae5abc7e61b00cd..b5340804fbd6139e74075a5022aa83094d1d98cb 100644
--- a/GUI/View/MaskWidgets/LineViews.h
+++ b/GUI/View/MaskWidgets/LineViews.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_LINEVIEWS_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_LINEVIEWS_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_LINEVIEWS_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_LINEVIEWS_H
#include "GUI/View/MaskWidgets/IShape2DView.h"
@@ -79,4 +79,4 @@ private:
HorizontalLineItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_LINEVIEWS_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_LINEVIEWS_H
diff --git a/GUI/View/MaskWidgets/MaskAllView.h b/GUI/View/MaskWidgets/MaskAllView.h
index 19c7f76b922f6b66511e4b8ef3510543951c24f1..c794fa54b9a84607184cdbc8a844a896d850bccf 100644
--- a/GUI/View/MaskWidgets/MaskAllView.h
+++ b/GUI/View/MaskWidgets/MaskAllView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKALLVIEW_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKALLVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKALLVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKALLVIEW_H
#include "GUI/View/MaskWidgets/IShape2DView.h"
@@ -45,4 +45,4 @@ private:
MaskAllItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKALLVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKALLVIEW_H
diff --git a/GUI/View/MaskWidgets/MaskContainerView.h b/GUI/View/MaskWidgets/MaskContainerView.h
index 33e587f64e5e65205173001e819ff3e5650d4b3e..731a4fe00cda439d7891d1512435dd2a4a6cfae6 100644
--- a/GUI/View/MaskWidgets/MaskContainerView.h
+++ b/GUI/View/MaskWidgets/MaskContainerView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKCONTAINERVIEW_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKCONTAINERVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKCONTAINERVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKCONTAINERVIEW_H
#include "GUI/View/MaskWidgets/IShape2DView.h"
#include "GUI/View/MaskWidgets/SizeHandleElement.h"
@@ -54,4 +54,4 @@ private:
SessionItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKCONTAINERVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKCONTAINERVIEW_H
diff --git a/GUI/View/MaskWidgets/MaskDrawingContext.h b/GUI/View/MaskWidgets/MaskDrawingContext.h
index dba8e8a123a4573f0ebd7b2e5966758a68636f39..b9db8c88b15c36a312658462370a137f9bb42672 100644
--- a/GUI/View/MaskWidgets/MaskDrawingContext.h
+++ b/GUI/View/MaskWidgets/MaskDrawingContext.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKDRAWINGCONTEXT_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKDRAWINGCONTEXT_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKDRAWINGCONTEXT_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKDRAWINGCONTEXT_H
#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
@@ -55,4 +55,4 @@ private:
bool m_drawing_in_progress;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKDRAWINGCONTEXT_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKDRAWINGCONTEXT_H
diff --git a/GUI/View/MaskWidgets/MaskEditor.h b/GUI/View/MaskWidgets/MaskEditor.h
index 1fdac346cd40c532d1b5debd8551d4347de09d4c..313d1dc90fda4760ad07b354da8606bcf6c555a3 100644
--- a/GUI/View/MaskWidgets/MaskEditor.h
+++ b/GUI/View/MaskWidgets/MaskEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITOR_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITOR_H
#include <QMainWindow>
#include <QModelIndex>
@@ -59,4 +59,4 @@ private:
MaskEditorCanvas* m_editorCanvas;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITOR_H
diff --git a/GUI/View/MaskWidgets/MaskEditorActions.h b/GUI/View/MaskWidgets/MaskEditorActions.h
index 1b3bace2d1ab1f39efbd3778e1bbe6cdcaa9d893..b42263de6c44abaff034590a249c370a0f8c8df5 100644
--- a/GUI/View/MaskWidgets/MaskEditorActions.h
+++ b/GUI/View/MaskWidgets/MaskEditorActions.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORACTIONS_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORACTIONS_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORACTIONS_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORACTIONS_H
#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
#include <QList>
@@ -78,4 +78,4 @@ private:
QItemSelectionModel* m_selectionModel;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORACTIONS_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORACTIONS_H
diff --git a/GUI/View/MaskWidgets/MaskEditorCanvas.h b/GUI/View/MaskWidgets/MaskEditorCanvas.h
index 3680f9dae18f7831bee9606a82a5641873c7c607..b9081d47f4840cc224b32ec9d020431c1fcf7569 100644
--- a/GUI/View/MaskWidgets/MaskEditorCanvas.h
+++ b/GUI/View/MaskWidgets/MaskEditorCanvas.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORCANVAS_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORCANVAS_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORCANVAS_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORCANVAS_H
#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
#include <QWidget>
@@ -64,4 +64,4 @@ private:
MaskResultsPresenter* m_resultsPresenter;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORCANVAS_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORCANVAS_H
diff --git a/GUI/View/MaskWidgets/MaskEditorFlags.h b/GUI/View/MaskWidgets/MaskEditorFlags.h
index 4a29808341a5c854a6cc4f369392136b7bdb1f61..dd2615138cf023fed656eb3cee289a26a968a45f 100644
--- a/GUI/View/MaskWidgets/MaskEditorFlags.h
+++ b/GUI/View/MaskWidgets/MaskEditorFlags.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORFLAGS_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORFLAGS_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORFLAGS_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORFLAGS_H
#include <QWidget>
@@ -50,4 +50,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(MaskEditorFlags::Stacking)
Q_DECLARE_OPERATORS_FOR_FLAGS(MaskEditorFlags::MaskValue)
Q_DECLARE_OPERATORS_FOR_FLAGS(MaskEditorFlags::PresentationType)
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORFLAGS_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORFLAGS_H
diff --git a/GUI/View/MaskWidgets/MaskEditorHelper.h b/GUI/View/MaskWidgets/MaskEditorHelper.h
index e193c0dc269c715877fc430a9ff87ee5f3886a5e..5fdf9173fb249e45370398652d7898513d867261 100644
--- a/GUI/View/MaskWidgets/MaskEditorHelper.h
+++ b/GUI/View/MaskWidgets/MaskEditorHelper.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORHELPER_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORHELPER_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORHELPER_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORHELPER_H
#include <QGraphicsItem>
@@ -49,4 +49,4 @@ public:
static QRectF getMarkerRectangle(const QPointF& pos);
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORHELPER_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORHELPER_H
diff --git a/GUI/View/MaskWidgets/MaskEditorPropertyPanel.h b/GUI/View/MaskWidgets/MaskEditorPropertyPanel.h
index d2819f11f16b750a77fbec6f067594a77d889c36..e1af695381cd612774b4727b236cf17a10fa9e9f 100644
--- a/GUI/View/MaskWidgets/MaskEditorPropertyPanel.h
+++ b/GUI/View/MaskWidgets/MaskEditorPropertyPanel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORPROPERTYPANEL_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORPROPERTYPANEL_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORPROPERTYPANEL_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORPROPERTYPANEL_H
#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
#include <QModelIndex>
@@ -67,4 +67,4 @@ private:
IntensityDataItem* m_intensityDataItem;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORPROPERTYPANEL_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORPROPERTYPANEL_H
diff --git a/GUI/View/MaskWidgets/MaskEditorToolBar.h b/GUI/View/MaskWidgets/MaskEditorToolBar.h
index a2899685e75cd5f4867d352a4914f23ed22b95e3..d6627d5a3a77eab58628e3a436f904c8e85a7caa 100644
--- a/GUI/View/MaskWidgets/MaskEditorToolBar.h
+++ b/GUI/View/MaskWidgets/MaskEditorToolBar.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORTOOLBAR_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORTOOLBAR_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORTOOLBAR_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORTOOLBAR_H
#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
#include <QToolBar>
@@ -59,4 +59,4 @@ private:
MaskEditorFlags::Activity m_previousActivity;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKEDITORTOOLBAR_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKEDITORTOOLBAR_H
diff --git a/GUI/View/MaskWidgets/MaskGraphicsProxy.h b/GUI/View/MaskWidgets/MaskGraphicsProxy.h
index e2f49e3c56f17fcb080fc170a23b18bbd9353070..bbe17efe3686ea1157b095e906510c7974c81dee 100644
--- a/GUI/View/MaskWidgets/MaskGraphicsProxy.h
+++ b/GUI/View/MaskWidgets/MaskGraphicsProxy.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKGRAPHICSPROXY_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKGRAPHICSPROXY_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSPROXY_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSPROXY_H
#include "GUI/View/MaskWidgets/MaskEditorHelper.h"
#include <QGraphicsProxyWidget>
@@ -53,4 +53,4 @@ private:
bool m_send_signals_to_colormap;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKGRAPHICSPROXY_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSPROXY_H
diff --git a/GUI/View/MaskWidgets/MaskGraphicsScene.h b/GUI/View/MaskWidgets/MaskGraphicsScene.h
index 4b6e2ecbd590a4f44ce32694e63aa81f8da7c07e..c2c26af32b251eac14650ec89d8aa56b3bff8176 100644
--- a/GUI/View/MaskWidgets/MaskGraphicsScene.h
+++ b/GUI/View/MaskWidgets/MaskGraphicsScene.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKGRAPHICSSCENE_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKGRAPHICSSCENE_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSSCENE_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSSCENE_H
#include "GUI/View/MaskWidgets/MaskDrawingContext.h"
#include "GUI/View/MaskWidgets/MaskEditorHelper.h"
@@ -122,4 +122,4 @@ private:
MaskDrawingContext m_context;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKGRAPHICSSCENE_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSSCENE_H
diff --git a/GUI/View/MaskWidgets/MaskGraphicsView.h b/GUI/View/MaskWidgets/MaskGraphicsView.h
index c78ce8471377152d25182123fa3052b8870c8c98..d41b7a916178400ac0cb30a7ddf2694584bf185f 100644
--- a/GUI/View/MaskWidgets/MaskGraphicsView.h
+++ b/GUI/View/MaskWidgets/MaskGraphicsView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKGRAPHICSVIEW_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKGRAPHICSVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSVIEW_H
#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
#include <QGraphicsView>
@@ -56,4 +56,4 @@ private:
double m_current_zoom_value;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKGRAPHICSVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKGRAPHICSVIEW_H
diff --git a/GUI/View/MaskWidgets/MaskResultsPresenter.h b/GUI/View/MaskWidgets/MaskResultsPresenter.h
index dd06058681e73e552179dbd3798f2755f33e9f27..68ff35fa069d4aa494bad726a846d708737b746f 100644
--- a/GUI/View/MaskWidgets/MaskResultsPresenter.h
+++ b/GUI/View/MaskWidgets/MaskResultsPresenter.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKRESULTSPRESENTER_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKRESULTSPRESENTER_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKRESULTSPRESENTER_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKRESULTSPRESENTER_H
#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
#include <QModelIndex>
@@ -51,4 +51,4 @@ private:
bool m_interpolation_flag_backup;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKRESULTSPRESENTER_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKRESULTSPRESENTER_H
diff --git a/GUI/View/MaskWidgets/MaskViewFactory.h b/GUI/View/MaskWidgets/MaskViewFactory.h
index 9d5b57c42b6617e19ca8a911f89cfa4798051778..e8851c1e4dd4320066d99f02723861f5d1e75112 100644
--- a/GUI/View/MaskWidgets/MaskViewFactory.h
+++ b/GUI/View/MaskWidgets/MaskViewFactory.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKVIEWFACTORY_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKVIEWFACTORY_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKVIEWFACTORY_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKVIEWFACTORY_H
#include <QString>
@@ -28,4 +28,4 @@ public:
static IShape2DView* createMaskView(SessionItem* item, ISceneAdaptor* adaptor = 0);
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKVIEWFACTORY_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_MASKVIEWFACTORY_H
diff --git a/GUI/View/MaskWidgets/PolygonPointView.h b/GUI/View/MaskWidgets/PolygonPointView.h
index 19b05b63dd0d27b3152b2465374f8cbb1fc612ef..4e50f9979dc1eeb0f18aa4d3a48955e4ccdbb071 100644
--- a/GUI/View/MaskWidgets/PolygonPointView.h
+++ b/GUI/View/MaskWidgets/PolygonPointView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_POLYGONPOINTVIEW_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_POLYGONPOINTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_POLYGONPOINTVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_POLYGONPOINTVIEW_H
#include "GUI/View/MaskWidgets/IShape2DView.h"
@@ -58,4 +58,4 @@ private:
bool m_on_hover;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_POLYGONPOINTVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_POLYGONPOINTVIEW_H
diff --git a/GUI/View/MaskWidgets/PolygonView.h b/GUI/View/MaskWidgets/PolygonView.h
index ef9c01c04d94ae39cfaf03a1a9df04707e83886e..ffb9c3f6e69523183a8aaca82c13dd41b18fc5cc 100644
--- a/GUI/View/MaskWidgets/PolygonView.h
+++ b/GUI/View/MaskWidgets/PolygonView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_POLYGONVIEW_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_POLYGONVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_POLYGONVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_POLYGONVIEW_H
#include "GUI/View/MaskWidgets/IShape2DView.h"
#include <QPolygonF>
@@ -65,4 +65,4 @@ private:
bool m_close_polygon_request;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_POLYGONVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_POLYGONVIEW_H
diff --git a/GUI/View/MaskWidgets/RectangleBaseView.h b/GUI/View/MaskWidgets/RectangleBaseView.h
index b76965ac31f2b0f01a8f0082332e2aacb70ed74f..2fe3c0df9ced9b0b3ca811fb896ad233f8ec73e9 100644
--- a/GUI/View/MaskWidgets/RectangleBaseView.h
+++ b/GUI/View/MaskWidgets/RectangleBaseView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_RECTANGLEBASEVIEW_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_RECTANGLEBASEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_RECTANGLEBASEVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_RECTANGLEBASEVIEW_H
#include "GUI/View/MaskWidgets/IShape2DView.h"
#include "GUI/View/MaskWidgets/SizeHandleElement.h"
@@ -57,4 +57,4 @@ protected:
SizeHandleElement* m_activeHandleElement;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_RECTANGLEBASEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_RECTANGLEBASEVIEW_H
diff --git a/GUI/View/MaskWidgets/RectangleView.h b/GUI/View/MaskWidgets/RectangleView.h
index 25a9243652c54558e23c6cea44eb88d484c62cda..d22b907934ccc3fb4e8e653cf698a479f7a841f7 100644
--- a/GUI/View/MaskWidgets/RectangleView.h
+++ b/GUI/View/MaskWidgets/RectangleView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_RECTANGLEVIEW_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_RECTANGLEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_RECTANGLEVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_RECTANGLEVIEW_H
#include "GUI/View/MaskWidgets/RectangleBaseView.h"
@@ -56,4 +56,4 @@ private:
RectangleItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_RECTANGLEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_RECTANGLEVIEW_H
diff --git a/GUI/View/MaskWidgets/RegionOfInterestView.h b/GUI/View/MaskWidgets/RegionOfInterestView.h
index b13eff4bca0c674733150110cfd23fd7d67bbcc0..3fe0ba417500df1822a0a53bc5c205a2629c6738 100644
--- a/GUI/View/MaskWidgets/RegionOfInterestView.h
+++ b/GUI/View/MaskWidgets/RegionOfInterestView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_REGIONOFINTERESTVIEW_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_REGIONOFINTERESTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_REGIONOFINTERESTVIEW_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_REGIONOFINTERESTVIEW_H
#include "GUI/View/MaskWidgets/RectangleView.h"
@@ -38,4 +38,4 @@ protected:
void paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*) override;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_REGIONOFINTERESTVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_REGIONOFINTERESTVIEW_H
diff --git a/GUI/View/MaskWidgets/SizeHandleElement.h b/GUI/View/MaskWidgets/SizeHandleElement.h
index bafcf2433f60cce24e58a5f4c2876d625218bb74..6a11a1dc2d64e5e8686a8909188b1a6106e5e448 100644
--- a/GUI/View/MaskWidgets/SizeHandleElement.h
+++ b/GUI/View/MaskWidgets/SizeHandleElement.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_SIZEHANDLEELEMENT_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_SIZEHANDLEELEMENT_H
+#ifndef BORNAGAIN_GUI_VIEW_MASKWIDGETS_SIZEHANDLEELEMENT_H
+#define BORNAGAIN_GUI_VIEW_MASKWIDGETS_SIZEHANDLEELEMENT_H
#include "GUI/View/MaskWidgets/MaskEditorHelper.h"
#include <QCursor>
@@ -72,4 +72,4 @@ private:
static QMap<EHandleLocation, EHandleLocation> m_opposite_handle_location;
};
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_SIZEHANDLEELEMENT_H
+#endif // BORNAGAIN_GUI_VIEW_MASKWIDGETS_SIZEHANDLEELEMENT_H
diff --git a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
index 2d8b6da18509aee7885b5931af473ee4b010b9f6..5885722d57eda63905464d64136d12afbc8fcb06 100644
--- a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
@@ -22,7 +22,7 @@
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Model/Types/VectorItem.h"
-#include "GUI/Util/GUIHelpers.h"
+#include "GUI/Util/EditUtil.h"
#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/MaterialEditor/MaterialEditorModel.h"
@@ -37,8 +37,6 @@
#include <QToolBar>
#include <QVBoxLayout>
-using namespace GUI::View::Helpers;
-
MaterialEditorDialog::MaterialEditorDialog(ProjectDocument* document, QWidget* parent)
: QDialog(parent), m_ui(new Ui::MaterialEditorDialog), m_document(document)
{
@@ -48,11 +46,13 @@ MaterialEditorDialog::MaterialEditorDialog(ProjectDocument* document, QWidget* p
m_ui->setupUi(this);
+ using GUI::View::EditUtil::configScientificDoubleEdit;
configScientificDoubleEdit(m_ui->deltaEdit, RealLimits::limitless());
configScientificDoubleEdit(m_ui->betaEdit, RealLimits::limitless());
configScientificDoubleEdit(m_ui->realEdit, RealLimits::limitless());
configScientificDoubleEdit(m_ui->imaginaryEdit, RealLimits::limitless());
+ using GUI::View::EditUtil::configSpinbox;
configSpinbox(m_ui->xSpinBox, 3, RealLimits::limitless());
configSpinbox(m_ui->ySpinBox, 3, RealLimits::limitless());
configSpinbox(m_ui->zSpinBox, 3, RealLimits::limitless());
diff --git a/GUI/View/MaterialEditor/MaterialEditorDialog.h b/GUI/View/MaterialEditor/MaterialEditorDialog.h
index 37eb0de00aaddcfe99de00c3ca129e1ad9c67dd8..8bd012e5e761c59bbd0bce7285b1dbe4fc6e2bcd 100644
--- a/GUI/View/MaterialEditor/MaterialEditorDialog.h
+++ b/GUI/View/MaterialEditor/MaterialEditorDialog.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MATERIALEDITOR_MATERIALEDITORDIALOG_H
-#define BORNAGAIN_GUI_VIEWS_MATERIALEDITOR_MATERIALEDITORDIALOG_H
+#ifndef BORNAGAIN_GUI_VIEW_MATERIALEDITOR_MATERIALEDITORDIALOG_H
+#define BORNAGAIN_GUI_VIEW_MATERIALEDITOR_MATERIALEDITORDIALOG_H
#include <QDialog>
#include <memory>
@@ -80,4 +80,4 @@ private:
ProjectDocument* m_document;
};
-#endif // BORNAGAIN_GUI_VIEWS_MATERIALEDITOR_MATERIALEDITORDIALOG_H
+#endif // BORNAGAIN_GUI_VIEW_MATERIALEDITOR_MATERIALEDITORDIALOG_H
diff --git a/GUI/View/MaterialEditor/MaterialEditorModel.h b/GUI/View/MaterialEditor/MaterialEditorModel.h
index 0e41a1d15964d42865727f456000e1eb2d58a72a..447b88a507f6c0534fdfab051ba2ade1233594a2 100644
--- a/GUI/View/MaterialEditor/MaterialEditorModel.h
+++ b/GUI/View/MaterialEditor/MaterialEditorModel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_MATERIALEDITOR_MATERIALEDITORMODEL_H
-#define BORNAGAIN_GUI_VIEWS_MATERIALEDITOR_MATERIALEDITORMODEL_H
+#ifndef BORNAGAIN_GUI_VIEW_MATERIALEDITOR_MATERIALEDITORMODEL_H
+#define BORNAGAIN_GUI_VIEW_MATERIALEDITOR_MATERIALEDITORMODEL_H
#include <QAbstractItemModel>
@@ -66,4 +66,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_MATERIALEDITOR_MATERIALEDITORMODEL_H
+#endif // BORNAGAIN_GUI_VIEW_MATERIALEDITOR_MATERIALEDITORMODEL_H
diff --git a/GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.h b/GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.h
index 187b263c81d650811ec13399f943e6f02d9f244b..87fada4c49ab6c40a6dfb42f067de2c64160d1f2 100644
--- a/GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.h
+++ b/GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
+#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -43,4 +43,4 @@ private:
ProjectionsEditor* m_projectionsEditor;
};
-#endif // BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsEditor.h b/GUI/View/ProjectionsWidgets/ProjectionsEditor.h
index 844c6e977d6eac729c84dfc32a52ec01993fb485..21afed5af21dbecbafc50fad66204a51a67dd81d 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsEditor.h
+++ b/GUI/View/ProjectionsWidgets/ProjectionsEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITOR_H
+#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITOR_H
#include <QMainWindow>
@@ -54,4 +54,4 @@ private:
QItemSelectionModel* m_selectionModel;
};
-#endif // BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITOR_H
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsEditorActions.h b/GUI/View/ProjectionsWidgets/ProjectionsEditorActions.h
index 765b21e0593e008f9966f388c5e0cd4420856221..2b09bffdd0c9f237bb77aa5d0af919fcf856942a 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsEditorActions.h
+++ b/GUI/View/ProjectionsWidgets/ProjectionsEditorActions.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSEDITORACTIONS_H
-#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSEDITORACTIONS_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITORACTIONS_H
+#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITORACTIONS_H
#include <QList>
#include <QModelIndex>
@@ -58,4 +58,4 @@ private:
QWidget* m_parent;
};
-#endif // BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSEDITORACTIONS_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITORACTIONS_H
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.h b/GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.h
index 7256db9d64f8773225e32f7ba1c79c8d923360fc..19b5d30b4d3519bbb962dac8c68c2b2d2697ad92 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.h
+++ b/GUI/View/ProjectionsWidgets/ProjectionsEditorCanvas.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSEDITORCANVAS_H
-#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSEDITORCANVAS_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITORCANVAS_H
+#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITORCANVAS_H
#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
#include <QModelIndex>
@@ -79,4 +79,4 @@ private:
bool m_block_update;
};
-#endif // BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSEDITORCANVAS_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSEDITORCANVAS_H
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsPlot.h b/GUI/View/ProjectionsWidgets/ProjectionsPlot.h
index ab0b287ebf240ece15eafe911353d9c80e18e128..671c9a4300c87aa377e0b7c5484faf66aee9e7b3 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsPlot.h
+++ b/GUI/View/ProjectionsWidgets/ProjectionsPlot.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPLOT_H
-#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPLOT_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSPLOT_H
+#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSPLOT_H
#include "GUI/Widget/Common/SessionItemWidget.h"
#include <QMap>
@@ -75,4 +75,4 @@ private:
bool m_block_plot_update;
};
-#endif // BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPLOT_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSPLOT_H
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsPropertyPanel.h b/GUI/View/ProjectionsWidgets/ProjectionsPropertyPanel.h
index 2c1c2f55dea97f089c5f44ef01c960bc147c56d5..68944d3b10c84edbd95fdb8d97fd6da708509a5e 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsPropertyPanel.h
+++ b/GUI/View/ProjectionsWidgets/ProjectionsPropertyPanel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPROPERTYPANEL_H
-#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPROPERTYPANEL_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSPROPERTYPANEL_H
+#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSPROPERTYPANEL_H
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -36,4 +36,4 @@ private:
ComponentEditor* m_componentEditor;
};
-#endif // BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSPROPERTYPANEL_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSPROPERTYPANEL_H
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsToolBar.h b/GUI/View/ProjectionsWidgets/ProjectionsToolBar.h
index 378a019ff92758397200e56a4c3971a91a2c4ab4..2ffa856296162f9db8288cd5727f08c1b40b3f81 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsToolBar.h
+++ b/GUI/View/ProjectionsWidgets/ProjectionsToolBar.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSTOOLBAR_H
-#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSTOOLBAR_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSTOOLBAR_H
+#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSTOOLBAR_H
#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
#include <QToolBar>
@@ -53,4 +53,4 @@ private:
MaskEditorFlags::Activity m_previousActivity;
};
-#endif // BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSTOOLBAR_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSTOOLBAR_H
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsWidget.h b/GUI/View/ProjectionsWidgets/ProjectionsWidget.h
index 055855e74b36ff17af49ea6dc5d2bd13c93a945f..927cbed7efbb64634c1375cad5ac32fa55939bf1 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsWidget.h
+++ b/GUI/View/ProjectionsWidgets/ProjectionsWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
+#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
#include "GUI/View/MaskWidgets/MaskEditorFlags.h"
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -50,4 +50,4 @@ private:
QTabWidget* m_tabWidget;
};
-#endif // BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
diff --git a/GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.h b/GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.h
index e68727360ec1edf78bf6350eeb107e8254f9e031..4726b5c29462743ce3d3c8a03795e30ff0a2a050 100644
--- a/GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.h
+++ b/GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_SAVEPROJECTIONSASSISTANT_H
-#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_SAVEPROJECTIONSASSISTANT_H
+#ifndef BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_SAVEPROJECTIONSASSISTANT_H
+#define BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_SAVEPROJECTIONSASSISTANT_H
#include <QString>
#include <QVector>
@@ -56,4 +56,4 @@ private:
QString projectionFileHeader(ProjectionsData& projectionsData);
};
-#endif // BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_SAVEPROJECTIONSASSISTANT_H
+#endif // BORNAGAIN_GUI_VIEW_PROJECTIONSWIDGETS_SAVEPROJECTIONSASSISTANT_H
diff --git a/GUI/View/PropertyEditor/ComponentEditor.h b/GUI/View/PropertyEditor/ComponentEditor.h
index 791c2f5bf716e04ef40e812f57cb5998e94bb0a4..6c6827c8000fedee91f76d39a2c504b8af29328b 100644
--- a/GUI/View/PropertyEditor/ComponentEditor.h
+++ b/GUI/View/PropertyEditor/ComponentEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_COMPONENTEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_COMPONENTEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTEDITOR_H
+#define BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTEDITOR_H
#include <QWidget>
@@ -71,4 +71,4 @@ private:
Q_DECLARE_OPERATORS_FOR_FLAGS(ComponentEditor::EditorType)
-#endif // BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_COMPONENTEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTEDITOR_H
diff --git a/GUI/View/PropertyEditor/ComponentFlatView.h b/GUI/View/PropertyEditor/ComponentFlatView.h
index 899004845a26f4613a4ca0a1d1398b2d0e60339a..1bfac9952349785c5f32fff6576220448e20f347 100644
--- a/GUI/View/PropertyEditor/ComponentFlatView.h
+++ b/GUI/View/PropertyEditor/ComponentFlatView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_COMPONENTFLATVIEW_H
-#define BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_COMPONENTFLATVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTFLATVIEW_H
+#define BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTFLATVIEW_H
#include "GUI/View/PropertyEditor/ComponentView.h"
#include <memory>
@@ -62,4 +62,4 @@ private:
QVector<const SessionItem*> m_topItems;
};
-#endif // BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_COMPONENTFLATVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTFLATVIEW_H
diff --git a/GUI/View/PropertyEditor/ComponentTreeActions.h b/GUI/View/PropertyEditor/ComponentTreeActions.h
index de2490c7ba56be2159107dede7f15da4fd274983..015dace296003db447f4da819a4401f7884aca92 100644
--- a/GUI/View/PropertyEditor/ComponentTreeActions.h
+++ b/GUI/View/PropertyEditor/ComponentTreeActions.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_COMPONENTTREEACTIONS_H
-#define BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_COMPONENTTREEACTIONS_H
+#ifndef BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTTREEACTIONS_H
+#define BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTTREEACTIONS_H
#include <QObject>
@@ -30,4 +30,4 @@ public slots:
void onCustomContextMenuRequested(const QPoint& point, SessionItem& item);
};
-#endif // BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_COMPONENTTREEACTIONS_H
+#endif // BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTTREEACTIONS_H
diff --git a/GUI/View/PropertyEditor/ComponentTreeView.h b/GUI/View/PropertyEditor/ComponentTreeView.h
index 2f646023a6e4a4cf35f32ca2924348435b7d66ee..b3c3275c837f2061f19b0035f42d2497b34e6e64 100644
--- a/GUI/View/PropertyEditor/ComponentTreeView.h
+++ b/GUI/View/PropertyEditor/ComponentTreeView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_COMPONENTTREEVIEW_H
-#define BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_COMPONENTTREEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTTREEVIEW_H
+#define BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTTREEVIEW_H
#include "GUI/View/PropertyEditor/ComponentView.h"
#include <memory>
@@ -59,4 +59,4 @@ private:
bool m_show_root_item; //!< Tree will starts from item itself, if true.
};
-#endif // BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_COMPONENTTREEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTTREEVIEW_H
diff --git a/GUI/View/PropertyEditor/ComponentView.h b/GUI/View/PropertyEditor/ComponentView.h
index 7a7e77af204d4c08e97e20774024f1ed9455ea78..20dcbcb85349caada4760b1d73050164a606c0a6 100644
--- a/GUI/View/PropertyEditor/ComponentView.h
+++ b/GUI/View/PropertyEditor/ComponentView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_COMPONENTVIEW_H
-#define BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_COMPONENTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTVIEW_H
+#define BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTVIEW_H
#include <QWidget>
@@ -31,4 +31,4 @@ public:
virtual void addItem(SessionItem*) {}
};
-#endif // BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_COMPONENTVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTVIEW_H
diff --git a/GUI/View/PropertyEditor/CustomEditors.h b/GUI/View/PropertyEditor/CustomEditors.h
index 336eb32b52c3b998adf82a669bab71841d523f39..91fa662aa5f72a8af37b1c50e46843344f5f4ea2 100644
--- a/GUI/View/PropertyEditor/CustomEditors.h
+++ b/GUI/View/PropertyEditor/CustomEditors.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_CUSTOMEDITORS_H
-#define BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_CUSTOMEDITORS_H
+#ifndef BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_CUSTOMEDITORS_H
+#define BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_CUSTOMEDITORS_H
#include "WinDllMacros.h"
#include <QVariant>
@@ -187,4 +187,4 @@ private:
QCheckBox* m_checkBox;
};
-#endif // BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_CUSTOMEDITORS_H
+#endif // BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_CUSTOMEDITORS_H
diff --git a/GUI/View/PropertyEditor/GroupInfoBox.h b/GUI/View/PropertyEditor/GroupInfoBox.h
index 36a43af0ccc7be824bbfa9b3ab1d5c3a5f640288..49242add3ef2eb8e179712f368edec7422f2217b 100644
--- a/GUI/View/PropertyEditor/GroupInfoBox.h
+++ b/GUI/View/PropertyEditor/GroupInfoBox.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_GROUPINFOBOX_H
-#define BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_GROUPINFOBOX_H
+#ifndef BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_GROUPINFOBOX_H
+#define BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_GROUPINFOBOX_H
#include <QGroupBox>
@@ -41,4 +41,4 @@ private:
int m_yImage;
};
-#endif // BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_GROUPINFOBOX_H
+#endif // BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_GROUPINFOBOX_H
diff --git a/GUI/View/PropertyEditor/MultiComboPropertyEditor.h b/GUI/View/PropertyEditor/MultiComboPropertyEditor.h
index 70441d335aa35939aba71b142a5985946d9df840..a38f79e507fdb146133d7e2e82783eafc2994b14 100644
--- a/GUI/View/PropertyEditor/MultiComboPropertyEditor.h
+++ b/GUI/View/PropertyEditor/MultiComboPropertyEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_MULTICOMBOPROPERTYEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_MULTICOMBOPROPERTYEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_MULTICOMBOPROPERTYEDITOR_H
+#define BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_MULTICOMBOPROPERTYEDITOR_H
#include "GUI/View/PropertyEditor/CustomEditors.h"
#include <QStyledItemDelegate>
@@ -64,4 +64,4 @@ public:
const QModelIndex& index) const;
};
-#endif // BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_MULTICOMBOPROPERTYEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_MULTICOMBOPROPERTYEDITOR_H
diff --git a/GUI/View/PropertyEditor/PropertyEditorFactory.h b/GUI/View/PropertyEditor/PropertyEditorFactory.h
index 7e71d4478cdf00116b38f36157bc5fcd534b3d29..0db4d93c6a7b2d16b9ef866c3c32245a9d27eff8 100644
--- a/GUI/View/PropertyEditor/PropertyEditorFactory.h
+++ b/GUI/View/PropertyEditor/PropertyEditorFactory.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_PROPERTYEDITORFACTORY_H
-#define BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_PROPERTYEDITORFACTORY_H
+#ifndef BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_PROPERTYEDITORFACTORY_H
+#define BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_PROPERTYEDITORFACTORY_H
#include <QString>
@@ -37,4 +37,4 @@ QWidget* CreateEditor(const SessionItem& item, QWidget* parent = nullptr);
} // namespace GUI::View::PropertyEditorFactory
-#endif // BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_PROPERTYEDITORFACTORY_H
+#endif // BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_PROPERTYEDITORFACTORY_H
diff --git a/GUI/View/PropertyEditor/PropertyWidgetItem.h b/GUI/View/PropertyEditor/PropertyWidgetItem.h
index 8a29675df1a568da8fc48e805b47997a05f6f5b0..38a9a62c0ed5aa70525327e27845b455be95042f 100644
--- a/GUI/View/PropertyEditor/PropertyWidgetItem.h
+++ b/GUI/View/PropertyEditor/PropertyWidgetItem.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_PROPERTYWIDGETITEM_H
-#define BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_PROPERTYWIDGETITEM_H
+#ifndef BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_PROPERTYWIDGETITEM_H
+#define BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_PROPERTYWIDGETITEM_H
#include <QObject>
@@ -50,4 +50,4 @@ private:
const SessionItem* m_item;
};
-#endif // BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_PROPERTYWIDGETITEM_H
+#endif // BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_PROPERTYWIDGETITEM_H
diff --git a/GUI/View/PropertyEditor/SessionModelDelegate.h b/GUI/View/PropertyEditor/SessionModelDelegate.h
index bbc2b417f0e6be9dc6f99b0fe773f2f6113ea628..06f3c68caf7049850459728061f557625620c19c 100644
--- a/GUI/View/PropertyEditor/SessionModelDelegate.h
+++ b/GUI/View/PropertyEditor/SessionModelDelegate.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_SESSIONMODELDELEGATE_H
-#define BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_SESSIONMODELDELEGATE_H
+#ifndef BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_SESSIONMODELDELEGATE_H
+#define BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_SESSIONMODELDELEGATE_H
#include <QStyledItemDelegate>
@@ -52,4 +52,4 @@ private:
const QModelIndex& index, const QString& text) const;
};
-#endif // BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_SESSIONMODELDELEGATE_H
+#endif // BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_SESSIONMODELDELEGATE_H
diff --git a/GUI/View/PropertyEditor/TestComponentView.h b/GUI/View/PropertyEditor/TestComponentView.h
index 530cbc9f423212a52aa5ab88c1bb79cba781ce05..c8dd372bb4d20970adb23857a4e242e06a1479c0 100644
--- a/GUI/View/PropertyEditor/TestComponentView.h
+++ b/GUI/View/PropertyEditor/TestComponentView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_TESTCOMPONENTVIEW_H
-#define BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_TESTCOMPONENTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_TESTCOMPONENTVIEW_H
+#define BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_TESTCOMPONENTVIEW_H
#include <QWidget>
@@ -62,4 +62,4 @@ private:
bool m_isExpaned;
};
-#endif // BORNAGAIN_GUI_VIEWS_PROPERTYEDITOR_TESTCOMPONENTVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_TESTCOMPONENTVIEW_H
diff --git a/GUI/View/RealSpaceWidgets/IPositionBuilder.h b/GUI/View/RealSpaceWidgets/IPositionBuilder.h
index eed74fab8f3c3c6edf310072e68d592e4ec3a0df..ac88c68c7ad17b7f3158c3723d90484ac4597a18 100644
--- a/GUI/View/RealSpaceWidgets/IPositionBuilder.h
+++ b/GUI/View/RealSpaceWidgets/IPositionBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_IPOSITIONBUILDER_H
-#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_IPOSITIONBUILDER_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_IPOSITIONBUILDER_H
+#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_IPOSITIONBUILDER_H
#include <memory>
#include <vector>
@@ -123,4 +123,4 @@ private:
std::unique_ptr<InterferenceRadialParaCrystal> m_iff;
};
-#endif // BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_IPOSITIONBUILDER_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_IPOSITIONBUILDER_H
diff --git a/GUI/View/RealSpaceWidgets/Particle3DContainer.h b/GUI/View/RealSpaceWidgets/Particle3DContainer.h
index d3f5d4ffc0f4e9892fd5ec59e9e9ae5b648c86d9..8226c38f42bdea33cf75f42f9e0292e93cf2cb9d 100644
--- a/GUI/View/RealSpaceWidgets/Particle3DContainer.h
+++ b/GUI/View/RealSpaceWidgets/Particle3DContainer.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_PARTICLE3DCONTAINER_H
-#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_PARTICLE3DCONTAINER_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_PARTICLE3DCONTAINER_H
+#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_PARTICLE3DCONTAINER_H
#include <QString>
#include <memory>
@@ -54,4 +54,4 @@ private:
std::vector<bool> m_containerParticlesBlend;
};
-#endif // BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_PARTICLE3DCONTAINER_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_PARTICLE3DCONTAINER_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpace2DParacrystalUtils.h b/GUI/View/RealSpaceWidgets/RealSpace2DParacrystalUtils.h
index 2a5bdd1b6a9baaa79f8c05735cedad00534bc949..bd00d04d3ca0d4c00ae0de4ddc7613c9d7b1e61d 100644
--- a/GUI/View/RealSpaceWidgets/RealSpace2DParacrystalUtils.h
+++ b/GUI/View/RealSpaceWidgets/RealSpace2DParacrystalUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACE2DPARACRYSTALUTILS_H
-#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACE2DPARACRYSTALUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACE2DPARACRYSTALUTILS_H
+#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACE2DPARACRYSTALUTILS_H
#include <vector>
@@ -26,4 +26,4 @@ std::vector<std::vector<double>> latticePositions(const Interference2DParaCrysta
}
-#endif // BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACE2DPARACRYSTALUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACE2DPARACRYSTALUTILS_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceActions.h b/GUI/View/RealSpaceWidgets/RealSpaceActions.h
index 60ce3df4619e8eb2315689da8c0f78242caec697..b45d4d51969a0a6bad83d8ca3fd748a2c8904fe5 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceActions.h
+++ b/GUI/View/RealSpaceWidgets/RealSpaceActions.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEACTIONS_H
-#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEACTIONS_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEACTIONS_H
+#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEACTIONS_H
#include <QObject>
@@ -26,4 +26,4 @@ public:
RealSpaceActions(QObject* parent = 0);
};
-#endif // BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEACTIONS_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEACTIONS_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceBuilder.h b/GUI/View/RealSpaceWidgets/RealSpaceBuilder.h
index 5916769bb30a1b1c3f7cc2ec830ed371fa4a54f4..bee59b854afe376cb898df4e4423cffce9a33cea 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceBuilder.h
+++ b/GUI/View/RealSpaceWidgets/RealSpaceBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEBUILDER_H
-#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEBUILDER_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEBUILDER_H
+#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEBUILDER_H
#include "GUI/ba3d/view/camera.h"
#include <QVector3D>
@@ -61,4 +61,4 @@ public:
const QVector3D& lattice_position = {}) const;
};
-#endif // BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEBUILDER_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEBUILDER_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceBuilderUtils.h b/GUI/View/RealSpaceWidgets/RealSpaceBuilderUtils.h
index c57d1e122e77e061184baec773a76742ef607d22..29a5ce025d07fb2bd0a885e6497e6c5552cf8fea 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceBuilderUtils.h
+++ b/GUI/View/RealSpaceWidgets/RealSpaceBuilderUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEBUILDERUTILS_H
-#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEBUILDERUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEBUILDERUTILS_H
+#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEBUILDERUTILS_H
#include "Sample/Scattering/Rotations.h"
#include <QVector3D>
@@ -89,4 +89,4 @@ Particle3DContainer mesoCrystal3DContainer(const MesoCrystalItem& mesoCrystalIte
} // namespace GUI::RealSpace::BuilderUtils
-#endif // BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEBUILDERUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEBUILDERUTILS_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceCanvas.h b/GUI/View/RealSpaceWidgets/RealSpaceCanvas.h
index 0e1d44d46953e6ec05060716faa1a64ffb94be5a..37e09b003e0bb3e2742a9ab4767104e8b5087f6f 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceCanvas.h
+++ b/GUI/View/RealSpaceWidgets/RealSpaceCanvas.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACECANVAS_H
-#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACECANVAS_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACECANVAS_H
+#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACECANVAS_H
#include <QItemSelectionModel>
#include <QModelIndex>
@@ -98,4 +98,4 @@ private:
void savePicture(const QPixmap& pixmap);
};
-#endif // BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACECANVAS_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACECANVAS_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h b/GUI/View/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h
index 21aa8104f7d9488e3d732d00c92598d3751e362f..d75c91f7681c699ed1e035348d6ed5cbba8644c7 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h
+++ b/GUI/View/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEMESOCRYSTALUTILS_H
-#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEMESOCRYSTALUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEMESOCRYSTALUTILS_H
+#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEMESOCRYSTALUTILS_H
#include "Sample/Scattering/Rotations.h"
#include <QVector3D>
@@ -38,4 +38,4 @@ private:
QVector3D m_origin;
};
-#endif // BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEMESOCRYSTALUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEMESOCRYSTALUTILS_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceModel.h b/GUI/View/RealSpaceWidgets/RealSpaceModel.h
index fc6643304256b143f602806dcc3913f7a3378fce..31b87fac904eb9a59ab7d471ed4842882d998d95 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceModel.h
+++ b/GUI/View/RealSpaceWidgets/RealSpaceModel.h
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEMODEL_H
-#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEMODEL_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEMODEL_H
+#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEMODEL_H
#include "GUI/ba3d/model/model.h"
class RealSpaceModel : public GUI::RealSpace::Model {
};
-#endif // BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEMODEL_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEMODEL_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpacePositionBuilder.h b/GUI/View/RealSpaceWidgets/RealSpacePositionBuilder.h
index 5058c784f83249177658e29e5b1b3beb1405be71..82ef9f49ca7e92a60731757b838762072d96f1f5 100644
--- a/GUI/View/RealSpaceWidgets/RealSpacePositionBuilder.h
+++ b/GUI/View/RealSpaceWidgets/RealSpacePositionBuilder.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEPOSITIONBUILDER_H
-#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEPOSITIONBUILDER_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEPOSITIONBUILDER_H
+#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEPOSITIONBUILDER_H
#include "Param/Node/INodeVisitor.h"
#include <memory>
@@ -41,4 +41,4 @@ private:
std::unique_ptr<IPositionBuilder> m_pos_builder;
};
-#endif // BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEPOSITIONBUILDER_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEPOSITIONBUILDER_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceToolBar.h b/GUI/View/RealSpaceWidgets/RealSpaceToolBar.h
index 9018dad4469d5778fcf3ce646f8a408b35d2d607..7de4e9b9c436e6f1b7c9ffb6a9f7aa4765199cbe 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceToolBar.h
+++ b/GUI/View/RealSpaceWidgets/RealSpaceToolBar.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACETOOLBAR_H
-#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACETOOLBAR_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACETOOLBAR_H
+#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACETOOLBAR_H
#include "GUI/Widget/Common/StyledToolBar.h"
@@ -47,4 +47,4 @@ private:
QToolButton* m_savePictureButton;
};
-#endif // BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACETOOLBAR_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACETOOLBAR_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceView.h b/GUI/View/RealSpaceWidgets/RealSpaceView.h
index 09e85df7ee7857a82d88d160667b323e08cc29f5..bb9cfa9df72d717f3250c8f03648946e1ce6ca37 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceView.h
+++ b/GUI/View/RealSpaceWidgets/RealSpaceView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEVIEW_H
-#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEVIEW_H
+#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEVIEW_H
#include <QWidget>
@@ -44,4 +44,4 @@ private:
GUI::RealSpace::Widget3D* m_3dview;
};
-#endif // BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEVIEW_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceWidget.h b/GUI/View/RealSpaceWidgets/RealSpaceWidget.h
index b11af78e43f081bfb095597a73fd91f270c2a4bc..9982518c087b54cd964931a9d031d22a5522e739 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceWidget.h
+++ b/GUI/View/RealSpaceWidgets/RealSpaceWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEWIDGET_H
+#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEWIDGET_H
#include <QWidget>
@@ -45,4 +45,4 @@ private:
QItemSelectionModel* m_selectionModel;
};
-#endif // BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_REALSPACEWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEWIDGET_H
diff --git a/GUI/View/RealSpaceWidgets/TransformTo3D.h b/GUI/View/RealSpaceWidgets/TransformTo3D.h
index a9456bf9d95b531d124c685d60617d42bd1f6400..122fd57e7e0f7df4f7dd52f8c79879867516e87f 100644
--- a/GUI/View/RealSpaceWidgets/TransformTo3D.h
+++ b/GUI/View/RealSpaceWidgets/TransformTo3D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_TRANSFORMTO3D_H
-#define BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_TRANSFORMTO3D_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_TRANSFORMTO3D_H
+#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_TRANSFORMTO3D_H
#include "Base/Vector/Vectors3D.h"
#include "GUI/ba3d/model/layer.h"
@@ -41,4 +41,4 @@ createParticlefromIFormFactor(const IFormFactor* ff);
} // namespace GUI::View::TransformTo3D
-#endif // BORNAGAIN_GUI_VIEWS_REALSPACEWIDGETS_TRANSFORMTO3D_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_TRANSFORMTO3D_H
diff --git a/GUI/View/SampleDesigner/ConnectableView.h b/GUI/View/SampleDesigner/ConnectableView.h
index e378f3ae9ad6366dfdd9ace35a24be2a4ecb2c13..799ae7a0d220f769b7fc169a97ab9d11b8f99f76 100644
--- a/GUI/View/SampleDesigner/ConnectableView.h
+++ b/GUI/View/SampleDesigner/ConnectableView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_CONNECTABLEVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_CONNECTABLEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_CONNECTABLEVIEW_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_CONNECTABLEVIEW_H
#include "GUI/View/SampleDesigner/IView.h"
#include "GUI/View/SampleDesigner/NodeEditorPort.h"
@@ -74,4 +74,4 @@ private:
QString hyphenate(const QString& name) const;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_CONNECTABLEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_CONNECTABLEVIEW_H
diff --git a/GUI/View/SampleDesigner/DesignerMimeData.h b/GUI/View/SampleDesigner/DesignerMimeData.h
index effb4e455ac7f66e4bdb79caba1a97816656f346..769f97369ee301c73b365fcf5de04e9f274fb176 100644
--- a/GUI/View/SampleDesigner/DesignerMimeData.h
+++ b/GUI/View/SampleDesigner/DesignerMimeData.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_DESIGNERMIMEDATA_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_DESIGNERMIMEDATA_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_DESIGNERMIMEDATA_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_DESIGNERMIMEDATA_H
#include <QMimeData>
@@ -36,4 +36,4 @@ private:
QString m_className;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_DESIGNERMIMEDATA_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_DESIGNERMIMEDATA_H
diff --git a/GUI/View/SampleDesigner/DesignerScene.h b/GUI/View/SampleDesigner/DesignerScene.h
index c055d84f248e60d01f27410d43f3327da38153e6..c616058e3feca8fe3979757b121924157f4ca0f7 100644
--- a/GUI/View/SampleDesigner/DesignerScene.h
+++ b/GUI/View/SampleDesigner/DesignerScene.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_DESIGNERSCENE_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_DESIGNERSCENE_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_DESIGNERSCENE_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_DESIGNERSCENE_H
#include <QGraphicsScene>
#include <QMap>
@@ -115,4 +115,4 @@ private:
NodeEditor* m_nodeEditor;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_DESIGNERSCENE_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_DESIGNERSCENE_H
diff --git a/GUI/View/SampleDesigner/DesignerView.h b/GUI/View/SampleDesigner/DesignerView.h
index 6eb50e07fcdc714b0069785757405a9546abfe09..959f24fabc59e10ab49d79855adf4d253961e547 100644
--- a/GUI/View/SampleDesigner/DesignerView.h
+++ b/GUI/View/SampleDesigner/DesignerView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_DESIGNERVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_DESIGNERVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_DESIGNERVIEW_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_DESIGNERVIEW_H
#include <QGraphicsView>
@@ -53,4 +53,4 @@ protected:
void keyReleaseEvent(QKeyEvent* event);
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_DESIGNERVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_DESIGNERVIEW_H
diff --git a/GUI/View/SampleDesigner/FormLayouter.h b/GUI/View/SampleDesigner/FormLayouter.h
index 78e95a70da6536ada48635d1b073629327b71305..4926e102732f901136e4653a547fa0ea0a7d3594 100644
--- a/GUI/View/SampleDesigner/FormLayouter.h
+++ b/GUI/View/SampleDesigner/FormLayouter.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_FORMLAYOUTER_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_FORMLAYOUTER_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_FORMLAYOUTER_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_FORMLAYOUTER_H
#include "GUI/Model/Group/SelectionDescriptor.h"
#include "GUI/View/SampleDesigner/SelectionContainerForm.h"
@@ -153,4 +153,4 @@ template <typename T> int FormLayouter::addSelection(const SelectionDescriptor<T
}
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_FORMLAYOUTER_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_FORMLAYOUTER_H
diff --git a/GUI/View/SampleDesigner/GroupBoxCollapser.h b/GUI/View/SampleDesigner/GroupBoxCollapser.h
index d74c00124dc163e4de07f1eefe23760dc66a1b4b..9bcd416b53f071842c5d78729c855a625ac087f3 100644
--- a/GUI/View/SampleDesigner/GroupBoxCollapser.h
+++ b/GUI/View/SampleDesigner/GroupBoxCollapser.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_GROUPBOXCOLLAPSER_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_GROUPBOXCOLLAPSER_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_GROUPBOXCOLLAPSER_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_GROUPBOXCOLLAPSER_H
#include <QObject>
@@ -62,4 +62,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_GROUPBOXCOLLAPSER_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_GROUPBOXCOLLAPSER_H
diff --git a/GUI/View/SampleDesigner/ILayerView.h b/GUI/View/SampleDesigner/ILayerView.h
index 660a79d2e89af67e8f84fac27e7b204aabbc1d85..3d771a07972f768bc9e81d328b55638fcf65f62c 100644
--- a/GUI/View/SampleDesigner/ILayerView.h
+++ b/GUI/View/SampleDesigner/ILayerView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_ILAYERVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_ILAYERVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_ILAYERVIEW_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_ILAYERVIEW_H
#include "GUI/View/SampleDesigner/ConnectableView.h"
@@ -64,4 +64,4 @@ public:
QLineF getInterfaceToScene();
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_ILAYERVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_ILAYERVIEW_H
diff --git a/GUI/View/SampleDesigner/IView.h b/GUI/View/SampleDesigner/IView.h
index 5c7e2884873fc6f6b176a55c2a08a00576a0ab92..c048c13cab15ebc1f862291274f7c74560fd925d 100644
--- a/GUI/View/SampleDesigner/IView.h
+++ b/GUI/View/SampleDesigner/IView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_IVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_IVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_IVIEW_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_IVIEW_H
#include "GUI/View/SampleDesigner/ViewTypes.h"
#include <QGraphicsObject>
@@ -65,4 +65,4 @@ inline SessionGraphicsItem* IView::getItem()
return m_item;
}
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_IVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_IVIEW_H
diff --git a/GUI/View/SampleDesigner/InterferenceForm.h b/GUI/View/SampleDesigner/InterferenceForm.h
index e780e2b4605d7a90250f113176f4536f693978a1..c9db999a80e80e1c3647076d7b176d7b21fdded1 100644
--- a/GUI/View/SampleDesigner/InterferenceForm.h
+++ b/GUI/View/SampleDesigner/InterferenceForm.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_INTERFERENCEFORM_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_INTERFERENCEFORM_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_INTERFERENCEFORM_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_INTERFERENCEFORM_H
#include <QGroupBox>
@@ -43,4 +43,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_INTERFERENCEFORM_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_INTERFERENCEFORM_H
diff --git a/GUI/View/SampleDesigner/InterferenceViews.h b/GUI/View/SampleDesigner/InterferenceViews.h
index 35e63a34ff08d0261bbf55738339fde479be5603..343d08af4bcfa0e91317c5a472c09c8f33e8f9d2 100644
--- a/GUI/View/SampleDesigner/InterferenceViews.h
+++ b/GUI/View/SampleDesigner/InterferenceViews.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_INTERFERENCEVIEWS_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_INTERFERENCEVIEWS_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_INTERFERENCEVIEWS_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_INTERFERENCEVIEWS_H
#include "GUI/View/SampleDesigner/ConnectableView.h"
@@ -59,4 +59,4 @@ public:
int type() const override { return GUI::View::Types::INTERFERENCE_FUNCTION_RADIAL_PARA; }
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_INTERFERENCEVIEWS_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_INTERFERENCEVIEWS_H
diff --git a/GUI/View/SampleDesigner/ItemTreeView.h b/GUI/View/SampleDesigner/ItemTreeView.h
index f4a0981d4ff7438309c2554eb49bf610d7e07b29..209ee1277859b5db7fa86a0281f7a98fb761db5b 100644
--- a/GUI/View/SampleDesigner/ItemTreeView.h
+++ b/GUI/View/SampleDesigner/ItemTreeView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_ITEMTREEVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_ITEMTREEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_ITEMTREEVIEW_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_ITEMTREEVIEW_H
#include <QTreeView>
@@ -29,4 +29,4 @@ protected:
#endif
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_ITEMTREEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_ITEMTREEVIEW_H
diff --git a/GUI/View/SampleDesigner/LayerEditorUtils.h b/GUI/View/SampleDesigner/LayerEditorUtils.h
index 3abc68ec10e4d32177c8e499a0829036e83ba2d7..52fde7d7264f43a1804e4b33ca39cff3b3897f1c 100644
--- a/GUI/View/SampleDesigner/LayerEditorUtils.h
+++ b/GUI/View/SampleDesigner/LayerEditorUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_LAYEREDITORUTILS_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_LAYEREDITORUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYEREDITORUTILS_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYEREDITORUTILS_H
#include "GUI/Model/Types/DoubleDescriptor.h"
@@ -91,4 +91,4 @@ QList<QColor> predefinedLayerColors();
} // namespace LayerEditorUtils
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_LAYEREDITORUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYEREDITORUTILS_H
diff --git a/GUI/View/SampleDesigner/LayerForm.h b/GUI/View/SampleDesigner/LayerForm.h
index 7ddf2376a46d8e91d26c8dc88b507c2c1cffc1a7..1832f309c65e2428e27b6ea159ade4160140c184 100644
--- a/GUI/View/SampleDesigner/LayerForm.h
+++ b/GUI/View/SampleDesigner/LayerForm.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_LAYERFORM_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_LAYERFORM_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYERFORM_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYERFORM_H
#include "GUI/View/SampleDesigner/FormLayouter.h"
#include <QGroupBox>
@@ -52,4 +52,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_LAYERFORM_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYERFORM_H
diff --git a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.h b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.h
index 975b70184722d54dd2bd2bafd362dace713f8d40..0a11350d6f41352da4358aab5a0dea36f6da6a80 100644
--- a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.h
+++ b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_LAYERORIENTEDSAMPLEEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_LAYERORIENTEDSAMPLEEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYERORIENTEDSAMPLEEDITOR_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYERORIENTEDSAMPLEEDITOR_H
#include <QMap>
#include <QWidget>
@@ -54,4 +54,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_LAYERORIENTEDSAMPLEEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYERORIENTEDSAMPLEEDITOR_H
diff --git a/GUI/View/SampleDesigner/LayerView.h b/GUI/View/SampleDesigner/LayerView.h
index 464402cd08c1d1bf3dfeac3e1fb386bd6e5f4efc..06f1cabbdc822225e17c0b5c3143a677c969bc65 100644
--- a/GUI/View/SampleDesigner/LayerView.h
+++ b/GUI/View/SampleDesigner/LayerView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_LAYERVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_LAYERVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYERVIEW_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYERVIEW_H
#include "GUI/View/SampleDesigner/ILayerView.h"
@@ -31,4 +31,4 @@ public:
virtual void addView(IView* childView, int row = 0) override; // to add ParticleLayout
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_LAYERVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYERVIEW_H
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.h b/GUI/View/SampleDesigner/MaterialInplaceForm.h
index 03035d71af06261c7cde05830986ff77a7b0f374..0d1faa4fc1256e84660e5dc611b468e8bf4ae4fb 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.h
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_MATERIALINPLACEFORM_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_MATERIALINPLACEFORM_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MATERIALINPLACEFORM_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MATERIALINPLACEFORM_H
#include <QWidget>
@@ -43,4 +43,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_MATERIALINPLACEFORM_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MATERIALINPLACEFORM_H
diff --git a/GUI/View/SampleDesigner/MesoCrystalForm.h b/GUI/View/SampleDesigner/MesoCrystalForm.h
index 98651a19b40074d1ba7d1693e57be09b8d96aa16..8fed905d94197b4fa102772d74c7cd2946a9f659 100644
--- a/GUI/View/SampleDesigner/MesoCrystalForm.h
+++ b/GUI/View/SampleDesigner/MesoCrystalForm.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_MESOCRYSTALFORM_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_MESOCRYSTALFORM_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MESOCRYSTALFORM_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MESOCRYSTALFORM_H
#include <QGroupBox>
@@ -48,4 +48,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_MESOCRYSTALFORM_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MESOCRYSTALFORM_H
diff --git a/GUI/View/SampleDesigner/MesoCrystalView.h b/GUI/View/SampleDesigner/MesoCrystalView.h
index aeeedae45bdb6fd00c24fa53da53e96d1c99af42..19ecbef731afb4a175239f0a1e353c4409f9c431 100644
--- a/GUI/View/SampleDesigner/MesoCrystalView.h
+++ b/GUI/View/SampleDesigner/MesoCrystalView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_MESOCRYSTALVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_MESOCRYSTALVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MESOCRYSTALVIEW_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MESOCRYSTALVIEW_H
#include "GUI/View/SampleDesigner/ConnectableView.h"
@@ -29,4 +29,4 @@ public:
void addView(IView* childView, int row = 0) override;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_MESOCRYSTALVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MESOCRYSTALVIEW_H
diff --git a/GUI/View/SampleDesigner/MultiLayerForm.h b/GUI/View/SampleDesigner/MultiLayerForm.h
index bd5eac4fb98aaf835abc71980bc2f8d554544cc6..a4e8bd67a2f67acdaf4c3e1555d484439ab1daed 100644
--- a/GUI/View/SampleDesigner/MultiLayerForm.h
+++ b/GUI/View/SampleDesigner/MultiLayerForm.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_MULTILAYERFORM_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_MULTILAYERFORM_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MULTILAYERFORM_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MULTILAYERFORM_H
#include <QWidget>
@@ -80,4 +80,4 @@ private:
QList<QPushButton*> m_addLayerButtons;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_MULTILAYERFORM_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MULTILAYERFORM_H
diff --git a/GUI/View/SampleDesigner/MultiLayerView.h b/GUI/View/SampleDesigner/MultiLayerView.h
index 4422701517db449eeba97d1db299682147618069..13c51c85cdcabaac4f8202b7494e680769c9d4fe 100644
--- a/GUI/View/SampleDesigner/MultiLayerView.h
+++ b/GUI/View/SampleDesigner/MultiLayerView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_MULTILAYERVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_MULTILAYERVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MULTILAYERVIEW_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MULTILAYERVIEW_H
#include "GUI/View/SampleDesigner/ILayerView.h"
@@ -62,4 +62,4 @@ private:
QList<QLineF> m_interfaces;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_MULTILAYERVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MULTILAYERVIEW_H
diff --git a/GUI/View/SampleDesigner/NodeEditor.h b/GUI/View/SampleDesigner/NodeEditor.h
index 1fcc560de9916560352a93fdfde898ba38b2455f..f1631864f6ee22f06dfa63640d9db7edef8d58de 100644
--- a/GUI/View/SampleDesigner/NodeEditor.h
+++ b/GUI/View/SampleDesigner/NodeEditor.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_NODEEDITOR_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_NODEEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_NODEEDITOR_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_NODEEDITOR_H
/*
* Node editor: original code is taken from
@@ -58,4 +58,4 @@ private:
NodeEditorConnection* m_conn;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_NODEEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_NODEEDITOR_H
diff --git a/GUI/View/SampleDesigner/NodeEditorConnection.h b/GUI/View/SampleDesigner/NodeEditorConnection.h
index 8de74e6be797ef7f96f1a2ab7a82897644026c38..1ec66a1b85d25e30fb9fad6d81f883c0e248291d 100644
--- a/GUI/View/SampleDesigner/NodeEditorConnection.h
+++ b/GUI/View/SampleDesigner/NodeEditorConnection.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_NODEEDITORCONNECTION_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_NODEEDITORCONNECTION_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_NODEEDITORCONNECTION_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_NODEEDITORCONNECTION_H
/*
* Node editor: original code is taken from
@@ -62,4 +62,4 @@ private:
NodeEditorPort* m_port2;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_NODEEDITORCONNECTION_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_NODEEDITORCONNECTION_H
diff --git a/GUI/View/SampleDesigner/NodeEditorPort.h b/GUI/View/SampleDesigner/NodeEditorPort.h
index 0dd79f03b74da3d880984848fb54f4324ce189c8..13944098013d9d7741ae9a1069003670ca9b6846 100644
--- a/GUI/View/SampleDesigner/NodeEditorPort.h
+++ b/GUI/View/SampleDesigner/NodeEditorPort.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_NODEEDITORPORT_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_NODEEDITORPORT_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_NODEEDITORPORT_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_NODEEDITORPORT_H
/*
* Node editor: original code is taken from
@@ -95,4 +95,4 @@ inline NodeEditorPort::EPortType NodeEditorPort::getPortType() const
return m_port_type;
}
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_NODEEDITORPORT_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_NODEEDITORPORT_H
diff --git a/GUI/View/SampleDesigner/ParticleCompositionForm.h b/GUI/View/SampleDesigner/ParticleCompositionForm.h
index ec4d1efef699052bab862448f96f4e255c9d5498..748e7e21e3f20233128e6384227ca0f964aaa70f 100644
--- a/GUI/View/SampleDesigner/ParticleCompositionForm.h
+++ b/GUI/View/SampleDesigner/ParticleCompositionForm.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLECOMPOSITIONFORM_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLECOMPOSITIONFORM_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLECOMPOSITIONFORM_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLECOMPOSITIONFORM_H
#include <QGroupBox>
#include <QList>
@@ -45,4 +45,4 @@ private:
QList<QWidget*> m_structureEditingWidgets;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLECOMPOSITIONFORM_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLECOMPOSITIONFORM_H
diff --git a/GUI/View/SampleDesigner/ParticleCompositionView.h b/GUI/View/SampleDesigner/ParticleCompositionView.h
index 28b0ebad36462b208a299d52ceb50f92fcd5d9ea..1aa4c46ae00cd608e750a4d2413f24fa8853d465 100644
--- a/GUI/View/SampleDesigner/ParticleCompositionView.h
+++ b/GUI/View/SampleDesigner/ParticleCompositionView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLECOMPOSITIONVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLECOMPOSITIONVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLECOMPOSITIONVIEW_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLECOMPOSITIONVIEW_H
#include "GUI/View/SampleDesigner/ConnectableView.h"
@@ -29,4 +29,4 @@ public:
void addView(IView* childView, int row = 0) override;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLECOMPOSITIONVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLECOMPOSITIONVIEW_H
diff --git a/GUI/View/SampleDesigner/ParticleCoreShellForm.h b/GUI/View/SampleDesigner/ParticleCoreShellForm.h
index 8526641c9effc74f0e5e09bb3d13697ea606131e..bacd010e92babd0894b5895ea0a891863a576bdb 100644
--- a/GUI/View/SampleDesigner/ParticleCoreShellForm.h
+++ b/GUI/View/SampleDesigner/ParticleCoreShellForm.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLECORESHELLFORM_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLECORESHELLFORM_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLECORESHELLFORM_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLECORESHELLFORM_H
#include <QGroupBox>
#include <memory>
@@ -55,4 +55,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLECORESHELLFORM_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLECORESHELLFORM_H
diff --git a/GUI/View/SampleDesigner/ParticleCoreShellView.h b/GUI/View/SampleDesigner/ParticleCoreShellView.h
index 9195b3a9f2009b8b17f7facd58666a35d90ce128..81dec5402f12a33e5b334f5f2dd726469eb99220 100644
--- a/GUI/View/SampleDesigner/ParticleCoreShellView.h
+++ b/GUI/View/SampleDesigner/ParticleCoreShellView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLECORESHELLVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLECORESHELLVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLECORESHELLVIEW_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLECORESHELLVIEW_H
#include "GUI/View/SampleDesigner/ConnectableView.h"
@@ -29,4 +29,4 @@ public:
void addView(IView* childView, int row = 0) override;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLECORESHELLVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLECORESHELLVIEW_H
diff --git a/GUI/View/SampleDesigner/ParticleForm.h b/GUI/View/SampleDesigner/ParticleForm.h
index c0dd82eb471600a9320781ad8b09a966e313fdbb..fea336fa46f40222c01e127db451520acb738e2f 100644
--- a/GUI/View/SampleDesigner/ParticleForm.h
+++ b/GUI/View/SampleDesigner/ParticleForm.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLEFORM_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLEFORM_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLEFORM_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLEFORM_H
#include <QGroupBox>
@@ -34,4 +34,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLEFORM_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLEFORM_H
diff --git a/GUI/View/SampleDesigner/ParticleLayoutForm.h b/GUI/View/SampleDesigner/ParticleLayoutForm.h
index 22139972bdb000c1d957498575bcb0a98451edd1..2eabb3b35e86f045f5b50364a6b6ef7d53df06c9 100644
--- a/GUI/View/SampleDesigner/ParticleLayoutForm.h
+++ b/GUI/View/SampleDesigner/ParticleLayoutForm.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLELAYOUTFORM_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLELAYOUTFORM_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLELAYOUTFORM_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLELAYOUTFORM_H
#include <QGroupBox>
#include <QList>
@@ -46,4 +46,4 @@ private:
QList<QWidget*> m_structureEditingWidgets;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLELAYOUTFORM_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLELAYOUTFORM_H
diff --git a/GUI/View/SampleDesigner/ParticleLayoutView.h b/GUI/View/SampleDesigner/ParticleLayoutView.h
index 352472b2d5f8186fa8aab82a2b4069b15b631698..e342421b4c4f724e6aaa9a12eff317effc5f9f88 100644
--- a/GUI/View/SampleDesigner/ParticleLayoutView.h
+++ b/GUI/View/SampleDesigner/ParticleLayoutView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLELAYOUTVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLELAYOUTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLELAYOUTVIEW_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLELAYOUTVIEW_H
#include "GUI/View/SampleDesigner/ConnectableView.h"
@@ -26,4 +26,4 @@ public:
void addView(IView* childView, int row = 0) override; // to add Particle
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLELAYOUTVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLELAYOUTVIEW_H
diff --git a/GUI/View/SampleDesigner/ParticleView.h b/GUI/View/SampleDesigner/ParticleView.h
index f621d35095ebaed88fa24b6be2d9b41a3d239fc7..8b5cdaba6301e9f0ba814f7c382f1e0800c31edf 100644
--- a/GUI/View/SampleDesigner/ParticleView.h
+++ b/GUI/View/SampleDesigner/ParticleView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLEVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLEVIEW_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLEVIEW_H
#include "GUI/View/SampleDesigner/ConnectableView.h"
#include <QPixmap>
@@ -43,4 +43,4 @@ private:
QPixmap m_pixmap;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_PARTICLEVIEW_H
diff --git a/GUI/View/SampleDesigner/RealSpacePanel.h b/GUI/View/SampleDesigner/RealSpacePanel.h
index bfbd9685ac9dffe2f5e08fe81cec32734a9fca88..e333912078f760305ac8f10786c2c8d4375e72bb 100644
--- a/GUI/View/SampleDesigner/RealSpacePanel.h
+++ b/GUI/View/SampleDesigner/RealSpacePanel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_REALSPACEPANEL_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_REALSPACEPANEL_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_REALSPACEPANEL_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_REALSPACEPANEL_H
#include <QWidget>
@@ -35,4 +35,4 @@ private:
RealSpaceWidget* m_realSpaceWidget;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_REALSPACEPANEL_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_REALSPACEPANEL_H
diff --git a/GUI/View/SampleDesigner/SampleEditorCommands.h b/GUI/View/SampleDesigner/SampleEditorCommands.h
index d6df9d9f7cea42ac5c5d040519b43a82f1b0c2c5..e7641b1e77ea3347d26fd5ab264418bcc970aeb5 100644
--- a/GUI/View/SampleDesigner/SampleEditorCommands.h
+++ b/GUI/View/SampleDesigner/SampleEditorCommands.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEEDITORCOMMANDS_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEEDITORCOMMANDS_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEEDITORCOMMANDS_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEEDITORCOMMANDS_H
#include "GUI/Model/Sample/SampleModel.h"
#include <QUndoCommand>
@@ -58,4 +58,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEEDITORCOMMANDS_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEEDITORCOMMANDS_H
diff --git a/GUI/View/SampleDesigner/SampleEditorController.h b/GUI/View/SampleDesigner/SampleEditorController.h
index 977d34e3af04abb82b4867fa87636e77eb5d3ac8..8134098ee10e63e2cf516ce235c3f1de18cea085 100644
--- a/GUI/View/SampleDesigner/SampleEditorController.h
+++ b/GUI/View/SampleDesigner/SampleEditorController.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEEDITORCONTROLLER_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEEDITORCONTROLLER_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEEDITORCONTROLLER_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEEDITORCONTROLLER_H
#include <QUndoStack>
@@ -91,4 +91,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEEDITORCONTROLLER_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEEDITORCONTROLLER_H
diff --git a/GUI/View/SampleDesigner/SampleListView.h b/GUI/View/SampleDesigner/SampleListView.h
index d6825bfa1e2474df68e760f81d452b137f3e9ddc..82fd32478b239936bc314062a10b7066af39b083 100644
--- a/GUI/View/SampleDesigner/SampleListView.h
+++ b/GUI/View/SampleDesigner/SampleListView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLELISTVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLELISTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLELISTVIEW_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLELISTVIEW_H
#include <QListView>
@@ -57,4 +57,4 @@ private:
QAction* m_chooseFromLibraryAction;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLELISTVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLELISTVIEW_H
diff --git a/GUI/View/SampleDesigner/SamplePropertyWidget.h b/GUI/View/SampleDesigner/SamplePropertyWidget.h
index fd71f0f143da8cd60f8f5a5d911f9a12fa5aa862..3e38586ea57dcac4267626a0840dcc3bbd392ab9 100644
--- a/GUI/View/SampleDesigner/SamplePropertyWidget.h
+++ b/GUI/View/SampleDesigner/SamplePropertyWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEPROPERTYWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEPROPERTYWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEPROPERTYWIDGET_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEPROPERTYWIDGET_H
#include <QWidget>
@@ -42,4 +42,4 @@ private:
ComponentEditor* m_propertyEditor;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEPROPERTYWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEPROPERTYWIDGET_H
diff --git a/GUI/View/SampleDesigner/SampleToolBar.h b/GUI/View/SampleDesigner/SampleToolBar.h
index 60f5855b4463cac280602300e5f5200c83ac0222..5746da83e5262569f27fa3c3f0ce8f343faac4c5 100644
--- a/GUI/View/SampleDesigner/SampleToolBar.h
+++ b/GUI/View/SampleDesigner/SampleToolBar.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBAR_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBAR_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETOOLBAR_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETOOLBAR_H
#include "GUI/Widget/Common/StyledToolBar.h"
#include <QTreeView>
@@ -57,4 +57,4 @@ private:
SampleView* m_sampleView;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBAR_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETOOLBAR_H
diff --git a/GUI/View/SampleDesigner/SampleToolBox.h b/GUI/View/SampleDesigner/SampleToolBox.h
index 5cb7ac8326b3aef21466adc69c81b7c3cd9e7c6c..2daf95e4b871c01208b75265c1456daa5f9e20ea 100644
--- a/GUI/View/SampleDesigner/SampleToolBox.h
+++ b/GUI/View/SampleDesigner/SampleToolBox.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOX_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOX_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETOOLBOX_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETOOLBOX_H
#include <QWidget>
@@ -37,4 +37,4 @@ private:
SampleToolBoxTreeWidget* m_view;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOX_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETOOLBOX_H
diff --git a/GUI/View/SampleDesigner/SampleToolBoxGroupView.h b/GUI/View/SampleDesigner/SampleToolBoxGroupView.h
index 8b367ee74f20f6718b35dba26c462b80fa2c9079..3d30df0f46fecf890fa1217140a0010a34731e72 100644
--- a/GUI/View/SampleDesigner/SampleToolBoxGroupView.h
+++ b/GUI/View/SampleDesigner/SampleToolBoxGroupView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOXGROUPVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOXGROUPVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETOOLBOXGROUPVIEW_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETOOLBOXGROUPVIEW_H
#include <QListView>
@@ -53,4 +53,4 @@ private:
SampleToolBoxGroupModel* m_model;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOXGROUPVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETOOLBOXGROUPVIEW_H
diff --git a/GUI/View/SampleDesigner/SampleToolBoxTreeWidget.h b/GUI/View/SampleDesigner/SampleToolBoxTreeWidget.h
index 52290f766b5400487909fe2726f2ecae367b6feb..357e93453b9dd45d773aa1754471dacb891193dd 100644
--- a/GUI/View/SampleDesigner/SampleToolBoxTreeWidget.h
+++ b/GUI/View/SampleDesigner/SampleToolBoxTreeWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOXTREEWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOXTREEWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETOOLBOXTREEWIDGET_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETOOLBOXTREEWIDGET_H
#include <QTreeWidget>
@@ -57,4 +57,4 @@ private:
bool m_iconMode;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBOXTREEWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETOOLBOXTREEWIDGET_H
diff --git a/GUI/View/SampleDesigner/SampleTreeWidget.h b/GUI/View/SampleDesigner/SampleTreeWidget.h
index a62d4052c43c78501db80ceb6025d1c4b5c1a492..0d5659e4e0fce00d2390c18997f0ee63216d8100 100644
--- a/GUI/View/SampleDesigner/SampleTreeWidget.h
+++ b/GUI/View/SampleDesigner/SampleTreeWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETREEWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETREEWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETREEWIDGET_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETREEWIDGET_H
#include <QMap>
#include <QWidget>
@@ -49,4 +49,4 @@ private:
SampleModel* m_sampleModel;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLETREEWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLETREEWIDGET_H
diff --git a/GUI/View/SampleDesigner/SampleViewAligner.h b/GUI/View/SampleDesigner/SampleViewAligner.h
index ab40ad653d0793b68dd28ecfacae55fb942fe510..37dc84f09f9ec418c1e6c5197d12e5b70cb0f15b 100644
--- a/GUI/View/SampleDesigner/SampleViewAligner.h
+++ b/GUI/View/SampleDesigner/SampleViewAligner.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWALIGNER_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWALIGNER_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEVIEWALIGNER_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEVIEWALIGNER_H
#include <QMap>
#include <QModelIndex>
@@ -47,4 +47,4 @@ private:
QMap<IView*, QPointF> m_viewToPos;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWALIGNER_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEVIEWALIGNER_H
diff --git a/GUI/View/SampleDesigner/SampleViewFactory.h b/GUI/View/SampleDesigner/SampleViewFactory.h
index a0e8972086b271ff752953544045d0002a6bd0a0..4a33db1a184e9136c8615b17f485190bd582a911 100644
--- a/GUI/View/SampleDesigner/SampleViewFactory.h
+++ b/GUI/View/SampleDesigner/SampleViewFactory.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWFACTORY_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWFACTORY_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEVIEWFACTORY_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEVIEWFACTORY_H
#include <QStringList>
@@ -25,4 +25,4 @@ public:
static IView* createSampleView(const QString& model_type);
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWFACTORY_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEVIEWFACTORY_H
diff --git a/GUI/View/SampleDesigner/ScriptPanel.h b/GUI/View/SampleDesigner/ScriptPanel.h
index 1ea62acb95e306d4d9ec47d4bf77408980e2c245..0b3c5ed87cbcf5fd8486b382932bf6ad2e581b52 100644
--- a/GUI/View/SampleDesigner/ScriptPanel.h
+++ b/GUI/View/SampleDesigner/ScriptPanel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SCRIPTPANEL_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SCRIPTPANEL_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SCRIPTPANEL_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SCRIPTPANEL_H
#include "GUI/Widget/Common/InfoPanel.h"
@@ -54,4 +54,4 @@ private:
CautionSign* m_cautionSign;
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SCRIPTPANEL_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SCRIPTPANEL_H
diff --git a/GUI/View/SampleDesigner/SelectionContainerForm.h b/GUI/View/SampleDesigner/SelectionContainerForm.h
index da59ba759e8185f2246ea6fe101889eedabcb534..75ee5daad1f1ca65fcf2966876cb6807b3a925ec 100644
--- a/GUI/View/SampleDesigner/SelectionContainerForm.h
+++ b/GUI/View/SampleDesigner/SelectionContainerForm.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/Util/LayoutUtils.h"
@@ -99,4 +99,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
diff --git a/GUI/View/SampleDesigner/TransformationView.h b/GUI/View/SampleDesigner/TransformationView.h
index 285fd154953012c88b51ecfca7c0ec761fba7eb1..13cc712c4aff0b514d9d6c5af254132d9639406f 100644
--- a/GUI/View/SampleDesigner/TransformationView.h
+++ b/GUI/View/SampleDesigner/TransformationView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_TRANSFORMATIONVIEW_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_TRANSFORMATIONVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_TRANSFORMATIONVIEW_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_TRANSFORMATIONVIEW_H
#include "GUI/View/SampleDesigner/ConnectableView.h"
@@ -26,4 +26,4 @@ public:
int type() const override { return GUI::View::Types::TRANSFORMATION; }
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_TRANSFORMATIONVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_TRANSFORMATIONVIEW_H
diff --git a/GUI/View/SampleDesigner/ViewTypes.h b/GUI/View/SampleDesigner/ViewTypes.h
index 2023f8770389ae5996dedf0f8ec5e21e4d6dbcbe..716dc0eadcd64217be82a7b74ef5e5650420abe2 100644
--- a/GUI/View/SampleDesigner/ViewTypes.h
+++ b/GUI/View/SampleDesigner/ViewTypes.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_VIEWTYPES_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_VIEWTYPES_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_VIEWTYPES_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_VIEWTYPES_H
#include <QGraphicsItem>
@@ -42,4 +42,4 @@ enum EWidgetTypes {
}
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_VIEWTYPES_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_VIEWTYPES_H
diff --git a/GUI/View/SampleDesigner/WidgetMoverButton.h b/GUI/View/SampleDesigner/WidgetMoverButton.h
index 52bd3d6bf8801245bbf4f8e637f1ca2e8a0503bb..1b4fa1217f1e888c4e055760bace4a13593f7c58 100644
--- a/GUI/View/SampleDesigner/WidgetMoverButton.h
+++ b/GUI/View/SampleDesigner/WidgetMoverButton.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_WIDGETMOVERBUTTON_H
-#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_WIDGETMOVERBUTTON_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_WIDGETMOVERBUTTON_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_WIDGETMOVERBUTTON_H
#include <QTimer>
#include <QToolButton>
@@ -68,4 +68,4 @@ private:
};
-#endif // BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_WIDGETMOVERBUTTON_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_WIDGETMOVERBUTTON_H
diff --git a/GUI/View/SimulationWidgets/PythonScriptWidget.h b/GUI/View/SimulationWidgets/PythonScriptWidget.h
index 58f06ff91019fcda98b4dcd63e5cc632d18f8860..523f90c92cb52eb675bef10f1a19bc0291bd4f73 100644
--- a/GUI/View/SimulationWidgets/PythonScriptWidget.h
+++ b/GUI/View/SimulationWidgets/PythonScriptWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SIMULATIONWIDGETS_PYTHONSCRIPTWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_SIMULATIONWIDGETS_PYTHONSCRIPTWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_SIMULATIONWIDGETS_PYTHONSCRIPTWIDGET_H
+#define BORNAGAIN_GUI_VIEW_SIMULATIONWIDGETS_PYTHONSCRIPTWIDGET_H
#include <QDialog>
@@ -47,4 +47,4 @@ private:
QString m_outputDir;
};
-#endif // BORNAGAIN_GUI_VIEWS_SIMULATIONWIDGETS_PYTHONSCRIPTWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_SIMULATIONWIDGETS_PYTHONSCRIPTWIDGET_H
diff --git a/GUI/View/SpecularDataWidgets/Plot1DCanvas.h b/GUI/View/SpecularDataWidgets/Plot1DCanvas.h
index 6f359f97ab29e2398eafaffa07c2c67e0ccc5c81..b9adb5bc00c9443da525903f2f8fae22a30428d4 100644
--- a/GUI/View/SpecularDataWidgets/Plot1DCanvas.h
+++ b/GUI/View/SpecularDataWidgets/Plot1DCanvas.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
-#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
+#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
+#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -48,4 +48,4 @@ private:
PlotStatusLabel* m_statusLabel;
};
-#endif // BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
+#endif // BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
diff --git a/GUI/View/SpecularDataWidgets/SpecularDataCanvas.h b/GUI/View/SpecularDataWidgets/SpecularDataCanvas.h
index 7b8c3ba95779cf426e9d9929e21522bc5ed6f301..c647e45efa48061d1a49c262c0a570c9e84f7fc4 100644
--- a/GUI/View/SpecularDataWidgets/SpecularDataCanvas.h
+++ b/GUI/View/SpecularDataWidgets/SpecularDataCanvas.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
-#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
+#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
+#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
#include "GUI/Widget/Common/SessionItemWidget.h"
#include <QWidget>
@@ -57,4 +57,4 @@ private:
QAction* m_save_plot_action;
};
-#endif // BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
+#endif // BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
diff --git a/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h b/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h
index 00dc92fde85695cc70f8c73fc5f7043a70096259..6eb36c642facf1388e340469cfae93021bf39aab 100644
--- a/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h
+++ b/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
+#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
#include "GUI/Model/IO/AbstractDataLoader1D.h"
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -65,4 +65,4 @@ private:
AbstractDataLoader1D* m_loader; // only borrowed from realDataItem. Do not delete!
};
-#endif // BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
diff --git a/GUI/View/SpecularDataWidgets/SpecularDataWidget.h b/GUI/View/SpecularDataWidgets/SpecularDataWidget.h
index f98499c817ce224965c965fc18c057ab65c942e8..26f20938f0d9303ef3c553fe4d0dfa27f539309a 100644
--- a/GUI/View/SpecularDataWidgets/SpecularDataWidget.h
+++ b/GUI/View/SpecularDataWidgets/SpecularDataWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
+#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -41,4 +41,4 @@ private:
IntensityDataPropertyWidget* m_property_widget;
};
-#endif // BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
diff --git a/GUI/View/SpecularDataWidgets/SpecularPlot.h b/GUI/View/SpecularDataWidgets/SpecularPlot.h
index b286c8f71aa9204187d9bf3fa1fe61e63c45c59d..0f6ea858e0a1f7421b18fd4e09537292a371eeb1 100644
--- a/GUI/View/SpecularDataWidgets/SpecularPlot.h
+++ b/GUI/View/SpecularDataWidgets/SpecularPlot.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOT_H
-#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOT_H
+#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARPLOT_H
+#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARPLOT_H
#include "GUI/View/IntensityDataWidgets/ScientificPlot.h"
#include <memory>
@@ -108,4 +108,4 @@ private:
bool m_block_update;
};
-#endif // BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOT_H
+#endif // BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARPLOT_H
diff --git a/GUI/View/SpecularDataWidgets/SpecularPlotCanvas.h b/GUI/View/SpecularDataWidgets/SpecularPlotCanvas.h
index 9211e9c49d2e881678bd7b406a7e0c13e4a6baf1..316ea500c54c49781f45a250a8bf8b9d2525a23c 100644
--- a/GUI/View/SpecularDataWidgets/SpecularPlotCanvas.h
+++ b/GUI/View/SpecularDataWidgets/SpecularPlotCanvas.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
-#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
+#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
+#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -47,4 +47,4 @@ private:
PlotStatusLabel* m_statusLabel;
};
-#endif // BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
+#endif // BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
diff --git a/GUI/View/Toplevel/ImportDataView.h b/GUI/View/Toplevel/ImportDataView.h
index 14b9adcb7078440ede5c92e68975e7caf733374a..4bf0579f8c15d0fd762a13b3c85836c22d807b40 100644
--- a/GUI/View/Toplevel/ImportDataView.h
+++ b/GUI/View/Toplevel/ImportDataView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_IMPORTDATAVIEW_H
-#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_IMPORTDATAVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_TOPLEVEL_IMPORTDATAVIEW_H
+#define BORNAGAIN_GUI_VIEW_TOPLEVEL_IMPORTDATAVIEW_H
#include "GUI/View/ImportDataWidgets/RealDataPresenter.h"
#include "GUI/Widget/Common/ItemStackPresenter.h"
@@ -42,4 +42,4 @@ private:
ProjectDocument* m_document;
};
-#endif // BORNAGAIN_GUI_VIEWS_TOPLEVEL_IMPORTDATAVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_TOPLEVEL_IMPORTDATAVIEW_H
diff --git a/GUI/View/Toplevel/ProjectSettingsView.h b/GUI/View/Toplevel/ProjectSettingsView.h
index 4f152cbaffb0d80a34be846571d374a7f3dc9987..a73c0761a9d3007bad8e63eda1c679de9c7ad587 100644
--- a/GUI/View/Toplevel/ProjectSettingsView.h
+++ b/GUI/View/Toplevel/ProjectSettingsView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_PROJECTSETTINGSVIEW_H
-#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_PROJECTSETTINGSVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_TOPLEVEL_PROJECTSETTINGSVIEW_H
+#define BORNAGAIN_GUI_VIEW_TOPLEVEL_PROJECTSETTINGSVIEW_H
#include "GUI/Model/Project/ProjectDocument.h"
#include <QWidget>
@@ -50,4 +50,4 @@ private:
ProjectDocument* m_document;
};
-#endif // BORNAGAIN_GUI_VIEWS_TOPLEVEL_PROJECTSETTINGSVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_TOPLEVEL_PROJECTSETTINGSVIEW_H
diff --git a/GUI/View/Toplevel/SampleView.h b/GUI/View/Toplevel/SampleView.h
index d7d92d54eb0d289382106ed8950fd46df1a28dd7..36442e00fa9c4cc2c08472c540416eb8cccf4040 100644
--- a/GUI/View/Toplevel/SampleView.h
+++ b/GUI/View/Toplevel/SampleView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_SAMPLEVIEW_H
-#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_SAMPLEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_TOPLEVEL_SAMPLEVIEW_H
+#define BORNAGAIN_GUI_VIEW_TOPLEVEL_SAMPLEVIEW_H
#include <QMainWindow>
@@ -44,4 +44,4 @@ private:
bool m_useLayerOrientedEditor = false;
};
-#endif // BORNAGAIN_GUI_VIEWS_TOPLEVEL_SAMPLEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_TOPLEVEL_SAMPLEVIEW_H
diff --git a/GUI/View/Toplevel/SessionModelView.h b/GUI/View/Toplevel/SessionModelView.h
index 60b893b11c2a710ee28d2e88f4d7317590fa6c2c..7b44893c187b89460e0fa285542abfe5f5694d15 100644
--- a/GUI/View/Toplevel/SessionModelView.h
+++ b/GUI/View/Toplevel/SessionModelView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_SESSIONMODELVIEW_H
-#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_SESSIONMODELVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_TOPLEVEL_SESSIONMODELVIEW_H
+#define BORNAGAIN_GUI_VIEW_TOPLEVEL_SESSIONMODELVIEW_H
#include <QWidget>
@@ -55,4 +55,4 @@ private:
ProjectDocument* m_document;
};
-#endif // BORNAGAIN_GUI_VIEWS_TOPLEVEL_SESSIONMODELVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_TOPLEVEL_SESSIONMODELVIEW_H
diff --git a/GUI/View/Toplevel/SimulationView.h b/GUI/View/Toplevel/SimulationView.h
index 66b7bb3572b5ff66c92784e4109a84afe098cdcc..773f3adb655751c44cc40958c539a85eacf47a86 100644
--- a/GUI/View/Toplevel/SimulationView.h
+++ b/GUI/View/Toplevel/SimulationView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_SIMULATIONVIEW_H
-#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_SIMULATIONVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_TOPLEVEL_SIMULATIONVIEW_H
+#define BORNAGAIN_GUI_VIEW_TOPLEVEL_SIMULATIONVIEW_H
#include <QWidget>
@@ -91,4 +91,4 @@ private:
ProjectDocument* m_document;
};
-#endif // BORNAGAIN_GUI_VIEWS_TOPLEVEL_SIMULATIONVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_TOPLEVEL_SIMULATIONVIEW_H
diff --git a/GUI/View/Toplevel/TestView.h b/GUI/View/Toplevel/TestView.h
index 49f26bb84e71f48ce1c757f484711875ea16c546..8ceb8792f3731678c72a9e25f601113977dbe6e8 100644
--- a/GUI/View/Toplevel/TestView.h
+++ b/GUI/View/Toplevel/TestView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_TESTVIEW_H
-#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_TESTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_TOPLEVEL_TESTVIEW_H
+#define BORNAGAIN_GUI_VIEW_TOPLEVEL_TESTVIEW_H
#include <QWidget>
@@ -33,4 +33,4 @@ private:
MainWindow* m_mainWindow;
};
-#endif // BORNAGAIN_GUI_VIEWS_TOPLEVEL_TESTVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_TOPLEVEL_TESTVIEW_H
diff --git a/GUI/View/Toplevel/WelcomeView.h b/GUI/View/Toplevel/WelcomeView.h
index c6bd4398bc013f929937a85d432b1d77c380fd96..ce49ad398f261fad01b1f090e538f61c905298cf 100644
--- a/GUI/View/Toplevel/WelcomeView.h
+++ b/GUI/View/Toplevel/WelcomeView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_WELCOMEVIEW_H
-#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_WELCOMEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_TOPLEVEL_WELCOMEVIEW_H
+#define BORNAGAIN_GUI_VIEW_TOPLEVEL_WELCOMEVIEW_H
#include <QWidget>
@@ -35,4 +35,4 @@ private:
Ui::WelcomeView* m_ui;
};
-#endif // BORNAGAIN_GUI_VIEWS_TOPLEVEL_WELCOMEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_TOPLEVEL_WELCOMEVIEW_H
diff --git a/GUI/Widget/Common/AdjustingScrollArea.h b/GUI/Widget/Common/AdjustingScrollArea.h
index ca14ed814d734f0ebb48597ef1c225d2c4cbb85d..aa37611e5705d4486f569a54e4ca92dcac7cbf56 100644
--- a/GUI/Widget/Common/AdjustingScrollArea.h
+++ b/GUI/Widget/Common/AdjustingScrollArea.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_ADJUSTINGSCROLLAREA_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_ADJUSTINGSCROLLAREA_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_ADJUSTINGSCROLLAREA_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_ADJUSTINGSCROLLAREA_H
#include <QScrollArea>
@@ -33,4 +33,4 @@ private:
bool eventFilter(QObject* obj, QEvent* ev);
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_ADJUSTINGSCROLLAREA_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_ADJUSTINGSCROLLAREA_H
diff --git a/GUI/Widget/Common/DesignerHelper.h b/GUI/Widget/Common/DesignerHelper.h
index ccc724050fbcf1f9ed8f0f8dd02b433672dc8211..30f0de4d3066f0f3238b172c37e0e37d1bacc358 100644
--- a/GUI/Widget/Common/DesignerHelper.h
+++ b/GUI/Widget/Common/DesignerHelper.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_DESIGNERHELPER_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_DESIGNERHELPER_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_DESIGNERHELPER_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_DESIGNERHELPER_H
#include <QColor>
#include <QGradient>
@@ -75,4 +75,4 @@ public:
static int getPythonEditorFontSize();
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_DESIGNERHELPER_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_DESIGNERHELPER_H
diff --git a/GUI/Widget/Common/DockWidgetInfo.h b/GUI/Widget/Common/DockWidgetInfo.h
index 7178af7d6265321cc3edc8547d28b0311b05cf3f..6f1cca86861dc0f04cdd34bc1f627f86119d8b29 100644
--- a/GUI/Widget/Common/DockWidgetInfo.h
+++ b/GUI/Widget/Common/DockWidgetInfo.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_DOCKWIDGETINFO_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_DOCKWIDGETINFO_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_DOCKWIDGETINFO_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_DOCKWIDGETINFO_H
#include <qnamespace.h>
@@ -37,4 +37,4 @@ private:
Qt::DockWidgetArea m_area;
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_DOCKWIDGETINFO_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_DOCKWIDGETINFO_H
diff --git a/GUI/Widget/Common/DocksController.h b/GUI/Widget/Common/DocksController.h
index f5bac1760b47d2e373947270bf9395fd59b2d13a..85342fe351c9613992542b511f408a576346fd89 100644
--- a/GUI/Widget/Common/DocksController.h
+++ b/GUI/Widget/Common/DocksController.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_DOCKSCONTROLLER_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_DOCKSCONTROLLER_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_DOCKSCONTROLLER_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_DOCKSCONTROLLER_H
#include "GUI/Widget/Common/DockWidgetInfo.h"
#include <QObject>
@@ -72,4 +72,4 @@ private:
bool m_handleDockVisibilityChanges = true;
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_DOCKSCONTROLLER_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_DOCKSCONTROLLER_H
diff --git a/GUI/Widget/Common/InfoPanel.h b/GUI/Widget/Common/InfoPanel.h
index 335f66151a8964cd3eb44322b0dc4f4297545164..215e22a860fd6752d367948edc69d9a45ab739ab 100644
--- a/GUI/Widget/Common/InfoPanel.h
+++ b/GUI/Widget/Common/InfoPanel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_INFOPANEL_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_INFOPANEL_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_INFOPANEL_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_INFOPANEL_H
#include <QFrame>
@@ -51,4 +51,4 @@ protected:
int m_cached_height;
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_INFOPANEL_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_INFOPANEL_H
diff --git a/GUI/Widget/Common/InfoPanelToolBar.h b/GUI/Widget/Common/InfoPanelToolBar.h
index bef3b01c3ce038a2283817112d020f2b6c15a1a3..ea97e276cdafa9f01ee95df17217078c929da5ab 100644
--- a/GUI/Widget/Common/InfoPanelToolBar.h
+++ b/GUI/Widget/Common/InfoPanelToolBar.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_INFOPANELTOOLBAR_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_INFOPANELTOOLBAR_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_INFOPANELTOOLBAR_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_INFOPANELTOOLBAR_H
#include "GUI/Widget/Common/StyledToolBar.h"
@@ -41,4 +41,4 @@ private:
bool m_expanded;
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_INFOPANELTOOLBAR_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_INFOPANELTOOLBAR_H
diff --git a/GUI/Widget/Common/ItemComboToolBar.h b/GUI/Widget/Common/ItemComboToolBar.h
index 0f5e81cd015f13afb67c1401d0e008f4384fed13..bcc5082f7b7a15381bc73501f75350957475aab4 100644
--- a/GUI/Widget/Common/ItemComboToolBar.h
+++ b/GUI/Widget/Common/ItemComboToolBar.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_ITEMCOMBOTOOLBAR_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_ITEMCOMBOTOOLBAR_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_ITEMCOMBOTOOLBAR_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_ITEMCOMBOTOOLBAR_H
#include "GUI/Widget/Common/StyledToolBar.h"
#include <QList>
@@ -51,4 +51,4 @@ private:
QAction* m_comboBoxAction;
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_ITEMCOMBOTOOLBAR_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_ITEMCOMBOTOOLBAR_H
diff --git a/GUI/Widget/Common/ItemComboWidget.h b/GUI/Widget/Common/ItemComboWidget.h
index bfc7a813b46e18632a1f2c7adfdb96e90e782854..cbe459ff522eed097074484e171e9764f45f89a6 100644
--- a/GUI/Widget/Common/ItemComboWidget.h
+++ b/GUI/Widget/Common/ItemComboWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_ITEMCOMBOWIDGET_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_ITEMCOMBOWIDGET_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_ITEMCOMBOWIDGET_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_ITEMCOMBOWIDGET_H
#include "Base/Utils/IFactory.h"
#include "GUI/Widget/Common/SessionItemWidget.h"
@@ -72,4 +72,4 @@ private:
QWidget* m_blankWidget;
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_ITEMCOMBOWIDGET_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_ITEMCOMBOWIDGET_H
diff --git a/GUI/Widget/Common/ItemSelectorWidget.h b/GUI/Widget/Common/ItemSelectorWidget.h
index e2acaa929f09d719f5be1d7304a0aaabd26b73b9..b44245932a167fec2d1e7f71458be0f0a950d216 100644
--- a/GUI/Widget/Common/ItemSelectorWidget.h
+++ b/GUI/Widget/Common/ItemSelectorWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSELECTORWIDGET_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSELECTORWIDGET_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_ITEMSELECTORWIDGET_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_ITEMSELECTORWIDGET_H
#include <QItemSelectionModel>
#include <QWidget>
@@ -69,4 +69,4 @@ protected:
std::unique_ptr<SessionDecorationModel> m_decorationModel;
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSELECTORWIDGET_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_ITEMSELECTORWIDGET_H
diff --git a/GUI/Widget/Common/ItemStackPresenter.h b/GUI/Widget/Common/ItemStackPresenter.h
index 758cc07e67733477e32a81f5fe5ae233b94ca38e..4760091a8075a5bd2aa2589bc32605569ee71f26 100644
--- a/GUI/Widget/Common/ItemStackPresenter.h
+++ b/GUI/Widget/Common/ItemStackPresenter.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSTACKPRESENTER_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSTACKPRESENTER_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_ITEMSTACKPRESENTER_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_ITEMSTACKPRESENTER_H
#include "Base/Utils/Assert.h"
#include "GUI/Widget/Common/ItemStackWidget.h"
@@ -132,4 +132,4 @@ template <class T> void ItemStackPresenter<T>::removeWidgets()
m_itemToWidget.clear();
}
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSTACKPRESENTER_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_ITEMSTACKPRESENTER_H
diff --git a/GUI/Widget/Common/ItemStackWidget.h b/GUI/Widget/Common/ItemStackWidget.h
index 291c82efb16f12432a94804e2cd11ccd81bfab50..575477bf10a33c549785e2f8d63d693c8d405f43 100644
--- a/GUI/Widget/Common/ItemStackWidget.h
+++ b/GUI/Widget/Common/ItemStackWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSTACKWIDGET_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSTACKWIDGET_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_ITEMSTACKWIDGET_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_ITEMSTACKWIDGET_H
#include <QWidget>
@@ -56,4 +56,4 @@ protected:
QSize m_size_hint;
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_ITEMSTACKWIDGET_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_ITEMSTACKWIDGET_H
diff --git a/GUI/Widget/Common/ItemViewOverlayButtons.h b/GUI/Widget/Common/ItemViewOverlayButtons.h
index 92ec2629898f58b327000d9e24f83b3efa711d4c..1f7e5c3b14ce1356bf28285c059c15cc2309852d 100644
--- a/GUI/Widget/Common/ItemViewOverlayButtons.h
+++ b/GUI/Widget/Common/ItemViewOverlayButtons.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_ITEMVIEWOVERLAYBUTTONS_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_ITEMVIEWOVERLAYBUTTONS_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_ITEMVIEWOVERLAYBUTTONS_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_ITEMVIEWOVERLAYBUTTONS_H
#include <QObject>
#include <functional>
@@ -42,4 +42,4 @@ private:
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_ITEMVIEWOVERLAYBUTTONS_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_ITEMVIEWOVERLAYBUTTONS_H
diff --git a/GUI/Widget/Common/ModelTreeView.h b/GUI/Widget/Common/ModelTreeView.h
index ec055d055189e7c0bb21bccb43d6a71bd1c897f3..e158e2cbf86c6542b6ceb5d6381fdd2e6409ebcf 100644
--- a/GUI/Widget/Common/ModelTreeView.h
+++ b/GUI/Widget/Common/ModelTreeView.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_MODELTREEVIEW_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_MODELTREEVIEW_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_MODELTREEVIEW_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_MODELTREEVIEW_H
#include <QWidget>
@@ -43,4 +43,4 @@ private:
bool m_is_expanded;
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_MODELTREEVIEW_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_MODELTREEVIEW_H
diff --git a/GUI/Widget/Common/ScientificSpinBox.h b/GUI/Widget/Common/ScientificSpinBox.h
index 642304b663d04739dad80ceacec929aebf042570..9e47cafeb1aa994773bc7802a07386a31f86d6a4 100644
--- a/GUI/Widget/Common/ScientificSpinBox.h
+++ b/GUI/Widget/Common/ScientificSpinBox.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_SCIENTIFICSPINBOX_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_SCIENTIFICSPINBOX_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_SCIENTIFICSPINBOX_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_SCIENTIFICSPINBOX_H
#include <QAbstractSpinBox>
@@ -66,4 +66,4 @@ private:
QDoubleValidator m_validator;
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_SCIENTIFICSPINBOX_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_SCIENTIFICSPINBOX_H
diff --git a/GUI/Widget/Common/SessionItemController.h b/GUI/Widget/Common/SessionItemController.h
index 0993c8499caedf63b1daf02d6a2a016a5634aaac..dffb2d6c4e82e6939d3696ed4e9f7648ed87ff87 100644
--- a/GUI/Widget/Common/SessionItemController.h
+++ b/GUI/Widget/Common/SessionItemController.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_SESSIONITEMCONTROLLER_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_SESSIONITEMCONTROLLER_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_SESSIONITEMCONTROLLER_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_SESSIONITEMCONTROLLER_H
#include <QObject>
#include <functional>
@@ -53,4 +53,4 @@ private:
bool m_parent_subscribed;
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_SESSIONITEMCONTROLLER_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_SESSIONITEMCONTROLLER_H
diff --git a/GUI/Widget/Common/SessionItemWidget.h b/GUI/Widget/Common/SessionItemWidget.h
index 7417e06256c402dfbd02a63095053622966977ff..b7ecebcb3b8858a4ab4cc96ed70671de2689bf97 100644
--- a/GUI/Widget/Common/SessionItemWidget.h
+++ b/GUI/Widget/Common/SessionItemWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_SESSIONITEMWIDGET_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_SESSIONITEMWIDGET_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_SESSIONITEMWIDGET_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_SESSIONITEMWIDGET_H
#include <QWidget>
@@ -49,4 +49,4 @@ private:
SessionItemController* m_itemController;
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_SESSIONITEMWIDGET_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_SESSIONITEMWIDGET_H
diff --git a/GUI/Widget/Common/StatusLabel.h b/GUI/Widget/Common/StatusLabel.h
index dcba12cc657103a6a0757483c3cd464767e969f6..6463d1420fc2e1cf851edf635c304531d9e49d7e 100644
--- a/GUI/Widget/Common/StatusLabel.h
+++ b/GUI/Widget/Common/StatusLabel.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_STATUSLABEL_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_STATUSLABEL_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_STATUSLABEL_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_STATUSLABEL_H
#include <QFrame>
@@ -45,4 +45,4 @@ private:
QFont m_font;
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_STATUSLABEL_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_STATUSLABEL_H
diff --git a/GUI/Widget/Common/StyleUtils.h b/GUI/Widget/Common/StyleUtils.h
index 99f865bf1ae944c38adab0d555d15f9d82030bcd..3ed8a9082b77336635663e3667d804d1436389b1 100644
--- a/GUI/Widget/Common/StyleUtils.h
+++ b/GUI/Widget/Common/StyleUtils.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_STYLEUTILS_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_STYLEUTILS_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_STYLEUTILS_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_STYLEUTILS_H
#include <QFont>
#include <QString>
@@ -58,4 +58,4 @@ int PropertyPanelWidth();
} // namespace GUI::Util::Style
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_STYLEUTILS_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_STYLEUTILS_H
diff --git a/GUI/Widget/Common/StyledToolBar.h b/GUI/Widget/Common/StyledToolBar.h
index 9abdb82cb34b3ec746ebc872eae8148b5178bfde..9ead147c741cadef014f8af16876e19a10d2abed 100644
--- a/GUI/Widget/Common/StyledToolBar.h
+++ b/GUI/Widget/Common/StyledToolBar.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_STYLEDTOOLBAR_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_STYLEDTOOLBAR_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_STYLEDTOOLBAR_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_STYLEDTOOLBAR_H
#include <QToolBar>
@@ -32,4 +32,4 @@ protected:
void contextMenuEvent(QContextMenuEvent*);
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_STYLEDTOOLBAR_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_STYLEDTOOLBAR_H
diff --git a/GUI/Widget/Common/UpdateTimer.h b/GUI/Widget/Common/UpdateTimer.h
index 3be32eb6de100c4af258293d518ba324ddefdd18..f2d14934f17ee7d039f300bb7ab815b1a0278795 100644
--- a/GUI/Widget/Common/UpdateTimer.h
+++ b/GUI/Widget/Common/UpdateTimer.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_UPDATETIMER_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_UPDATETIMER_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_UPDATETIMER_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_UPDATETIMER_H
#include <QObject>
@@ -49,4 +49,4 @@ private:
QTimer* m_timer;
};
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_UPDATETIMER_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_UPDATETIMER_H
diff --git a/GUI/Widget/Common/detailsbutton.h b/GUI/Widget/Common/detailsbutton.h
index ba475700dcd42521e7ffaaf34fd96c4fb1966e1f..73df8ce59b76b6fae3493b9f374f4aa12731c044 100644
--- a/GUI/Widget/Common/detailsbutton.h
+++ b/GUI/Widget/Common/detailsbutton.h
@@ -23,8 +23,8 @@
**
****************************************************************************/
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_DETAILSBUTTON_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_DETAILSBUTTON_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_DETAILSBUTTON_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_DETAILSBUTTON_H
#include <QAbstractButton>
@@ -81,4 +81,4 @@ private:
} // namespace GUI::Util
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_DETAILSBUTTON_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_DETAILSBUTTON_H
diff --git a/GUI/Widget/Common/detailswidget.h b/GUI/Widget/Common/detailswidget.h
index 9840a4f37b59b05faf19213dc8f6d2514761295b..04d14f5fa6404e4084bd3cfd6eaef4861485fbdc 100644
--- a/GUI/Widget/Common/detailswidget.h
+++ b/GUI/Widget/Common/detailswidget.h
@@ -23,8 +23,8 @@
**
****************************************************************************/
-#ifndef BORNAGAIN_GUI_WIDGETS_COMMON_DETAILSWIDGET_H
-#define BORNAGAIN_GUI_WIDGETS_COMMON_DETAILSWIDGET_H
+#ifndef BORNAGAIN_GUI_WIDGET_COMMON_DETAILSWIDGET_H
+#define BORNAGAIN_GUI_WIDGET_COMMON_DETAILSWIDGET_H
#include <QWidget>
@@ -95,4 +95,4 @@ private:
} // namespace GUI::Util
-#endif // BORNAGAIN_GUI_WIDGETS_COMMON_DETAILSWIDGET_H
+#endif // BORNAGAIN_GUI_WIDGET_COMMON_DETAILSWIDGET_H
diff --git a/GUI/Widget/Info/CautionSign.h b/GUI/Widget/Info/CautionSign.h
index 4eb4a3e0e82b703c5e0dee35f4ba2042a2b9a85e..4cdb85799a97788f23b3687236da4d49abd83a84 100644
--- a/GUI/Widget/Info/CautionSign.h
+++ b/GUI/Widget/Info/CautionSign.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_INFO_CAUTIONSIGN_H
-#define BORNAGAIN_GUI_WIDGETS_INFO_CAUTIONSIGN_H
+#ifndef BORNAGAIN_GUI_WIDGET_INFO_CAUTIONSIGN_H
+#define BORNAGAIN_GUI_WIDGET_INFO_CAUTIONSIGN_H
#include <QObject>
@@ -50,4 +50,4 @@ private:
bool m_clear_just_had_happened;
};
-#endif // BORNAGAIN_GUI_WIDGETS_INFO_CAUTIONSIGN_H
+#endif // BORNAGAIN_GUI_WIDGET_INFO_CAUTIONSIGN_H
diff --git a/GUI/Widget/Info/CautionSignWidget.h b/GUI/Widget/Info/CautionSignWidget.h
index 53b22a9cc212009f778f8941a0e2992b5942d23f..18110fdce3b48f51d8d83c180cb55a969a9133f1 100644
--- a/GUI/Widget/Info/CautionSignWidget.h
+++ b/GUI/Widget/Info/CautionSignWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_INFO_CAUTIONSIGNWIDGET_H
-#define BORNAGAIN_GUI_WIDGETS_INFO_CAUTIONSIGNWIDGET_H
+#ifndef BORNAGAIN_GUI_WIDGET_INFO_CAUTIONSIGNWIDGET_H
+#define BORNAGAIN_GUI_WIDGET_INFO_CAUTIONSIGNWIDGET_H
#include <QPixmap>
#include <QString>
@@ -40,4 +40,4 @@ private:
QString m_caution_message;
};
-#endif // BORNAGAIN_GUI_WIDGETS_INFO_CAUTIONSIGNWIDGET_H
+#endif // BORNAGAIN_GUI_WIDGET_INFO_CAUTIONSIGNWIDGET_H
diff --git a/GUI/Widget/Info/ComboSelectorDialog.h b/GUI/Widget/Info/ComboSelectorDialog.h
index 34b23b71a7d2fce8afbb060612544cdf0fb0dce8..7ae4217e57e72a744297b814a0c8f131aa8ce9f6 100644
--- a/GUI/Widget/Info/ComboSelectorDialog.h
+++ b/GUI/Widget/Info/ComboSelectorDialog.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_INFO_COMBOSELECTORDIALOG_H
-#define BORNAGAIN_GUI_WIDGETS_INFO_COMBOSELECTORDIALOG_H
+#ifndef BORNAGAIN_GUI_WIDGET_INFO_COMBOSELECTORDIALOG_H
+#define BORNAGAIN_GUI_WIDGET_INFO_COMBOSELECTORDIALOG_H
#include <QDialog>
#include <QString>
@@ -45,4 +45,4 @@ private:
QLabel* m_bottomLabel;
};
-#endif // BORNAGAIN_GUI_WIDGETS_INFO_COMBOSELECTORDIALOG_H
+#endif // BORNAGAIN_GUI_WIDGET_INFO_COMBOSELECTORDIALOG_H
diff --git a/GUI/Widget/Info/DetailedMessageBox.h b/GUI/Widget/Info/DetailedMessageBox.h
index 1fc7a36e1d34a4ab2f4f951ec04439e3dddbe9b9..d812ed37ebc531687fdb943f5bdffb4fe1a120de 100644
--- a/GUI/Widget/Info/DetailedMessageBox.h
+++ b/GUI/Widget/Info/DetailedMessageBox.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_INFO_DETAILEDMESSAGEBOX_H
-#define BORNAGAIN_GUI_WIDGETS_INFO_DETAILEDMESSAGEBOX_H
+#ifndef BORNAGAIN_GUI_WIDGET_INFO_DETAILEDMESSAGEBOX_H
+#define BORNAGAIN_GUI_WIDGET_INFO_DETAILEDMESSAGEBOX_H
#include <QDialog>
#include <QString>
@@ -43,4 +43,4 @@ private:
QTextEdit* m_textEdit;
};
-#endif // BORNAGAIN_GUI_WIDGETS_INFO_DETAILEDMESSAGEBOX_H
+#endif // BORNAGAIN_GUI_WIDGET_INFO_DETAILEDMESSAGEBOX_H
diff --git a/GUI/Widget/Info/OverlayLabelController.h b/GUI/Widget/Info/OverlayLabelController.h
index 429a1b735e48d2189ec1feef0770482d0fffede3..9aa6491fea0192a42a3b1648c30283311ff1c8d7 100644
--- a/GUI/Widget/Info/OverlayLabelController.h
+++ b/GUI/Widget/Info/OverlayLabelController.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_INFO_OVERLAYLABELCONTROLLER_H
-#define BORNAGAIN_GUI_WIDGETS_INFO_OVERLAYLABELCONTROLLER_H
+#ifndef BORNAGAIN_GUI_WIDGET_INFO_OVERLAYLABELCONTROLLER_H
+#define BORNAGAIN_GUI_WIDGET_INFO_OVERLAYLABELCONTROLLER_H
#include <QObject>
#include <QString>
@@ -46,4 +46,4 @@ private:
QString m_text;
};
-#endif // BORNAGAIN_GUI_WIDGETS_INFO_OVERLAYLABELCONTROLLER_H
+#endif // BORNAGAIN_GUI_WIDGET_INFO_OVERLAYLABELCONTROLLER_H
diff --git a/GUI/Widget/Info/OverlayLabelWidget.h b/GUI/Widget/Info/OverlayLabelWidget.h
index 76d4e00652e5c01f695ad734947c3982dfa3ef2b..86370127c1e482cc30d73713355276114869b7e1 100644
--- a/GUI/Widget/Info/OverlayLabelWidget.h
+++ b/GUI/Widget/Info/OverlayLabelWidget.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_INFO_OVERLAYLABELWIDGET_H
-#define BORNAGAIN_GUI_WIDGETS_INFO_OVERLAYLABELWIDGET_H
+#ifndef BORNAGAIN_GUI_WIDGET_INFO_OVERLAYLABELWIDGET_H
+#define BORNAGAIN_GUI_WIDGET_INFO_OVERLAYLABELWIDGET_H
#include <QRect>
#include <QString>
@@ -40,4 +40,4 @@ private:
QRect m_bounding_rect;
};
-#endif // BORNAGAIN_GUI_WIDGETS_INFO_OVERLAYLABELWIDGET_H
+#endif // BORNAGAIN_GUI_WIDGET_INFO_OVERLAYLABELWIDGET_H
diff --git a/GUI/Widget/Info/ProjectLoadProblemDialog.h b/GUI/Widget/Info/ProjectLoadProblemDialog.h
index 993aa0176a02ac682f8ac223adb2ffcf7524a23c..465173c816656dcbe0038ec7cef27e817acc1468 100644
--- a/GUI/Widget/Info/ProjectLoadProblemDialog.h
+++ b/GUI/Widget/Info/ProjectLoadProblemDialog.h
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_WIDGETS_INFO_PROJECTLOADPROBLEMDIALOG_H
-#define BORNAGAIN_GUI_WIDGETS_INFO_PROJECTLOADPROBLEMDIALOG_H
+#ifndef BORNAGAIN_GUI_WIDGET_INFO_PROJECTLOADPROBLEMDIALOG_H
+#define BORNAGAIN_GUI_WIDGET_INFO_PROJECTLOADPROBLEMDIALOG_H
#include <QDialog>
#include <QString>
@@ -34,4 +34,4 @@ private:
QString m_projectDocumentVersion;
};
-#endif // BORNAGAIN_GUI_WIDGETS_INFO_PROJECTLOADPROBLEMDIALOG_H
+#endif // BORNAGAIN_GUI_WIDGET_INFO_PROJECTLOADPROBLEMDIALOG_H
diff --git a/GUI/Widget/Info/PythonSyntaxHighlighter.h b/GUI/Widget/Info/PythonSyntaxHighlighter.h
index bf14021a1825297836caeaca2e4f38d8cfe4e3ef..2fcbc51836623f69994915ce8b401811c9a43099 100644
--- a/GUI/Widget/Info/PythonSyntaxHighlighter.h
+++ b/GUI/Widget/Info/PythonSyntaxHighlighter.h
@@ -35,8 +35,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifndef BORNAGAIN_GUI_WIDGETS_INFO_PYTHONSYNTAXHIGHLIGHTER_H
-#define BORNAGAIN_GUI_WIDGETS_INFO_PYTHONSYNTAXHIGHLIGHTER_H
+#ifndef BORNAGAIN_GUI_WIDGET_INFO_PYTHONSYNTAXHIGHLIGHTER_H
+#define BORNAGAIN_GUI_WIDGET_INFO_PYTHONSYNTAXHIGHLIGHTER_H
#include <QSyntaxHighlighter>
@@ -86,4 +86,4 @@ private:
QRegExp triDoubleQuote;
};
-#endif // BORNAGAIN_GUI_WIDGETS_INFO_PYTHONSYNTAXHIGHLIGHTER_H
+#endif // BORNAGAIN_GUI_WIDGET_INFO_PYTHONSYNTAXHIGHLIGHTER_H
diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
index 7078918e29aa8553f679fe50195aec425a41d1f3..f169e56001dd8f91becf4ab8ea599b5783de3b62 100644
--- a/Tests/Unit/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Tests/Unit/GUI/Util.cpp
+//! @file Tests/Unit/GUI/Utils.cpp
//! @brief Implements auxiliary test functions in a namespace.
//!
//! @homepage http://www.bornagainproject.org
diff --git a/Tests/Unit/GUI/Utils.h b/Tests/Unit/GUI/Utils.h
index 2a3abeb152a016d0f64ae2770a1e63653f6a4fc5..c30ae5b7f67de721db8908255e26468780b94c22 100644
--- a/Tests/Unit/GUI/Utils.h
+++ b/Tests/Unit/GUI/Utils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Tests/Unit/GUI/Util.h
+//! @file Tests/Unit/GUI/Utils.h
//! @brief Defines auxiliary test functions in a namespace.
//!
//! @homepage http://www.bornagainproject.org
diff --git a/Wrap/Swig/libBornAgainBase.i b/Wrap/Swig/libBornAgainBase.i
index 42d14c8fbae37996e938cdab8ec979684fa41919..4c65257ab78d9a8cc52f223a7fc1db9d0698bfa6 100644
--- a/Wrap/Swig/libBornAgainBase.i
+++ b/Wrap/Swig/libBornAgainBase.i
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Wrap/swig/libBornAgainBase.i
+//! @file Wrap/Swig/libBornAgainBase.i
//! @brief SWIG interface file for libBornAgainBase
//!
//! @homepage http://apps.jcns.fz-juelich.de/BornAgain
diff --git a/Wrap/Swig/libBornAgainCore.i b/Wrap/Swig/libBornAgainCore.i
index c552d1831770b2fb9eac948e53a992096da61323..44d1934ad846069c4bf6ea905b3b8f4ea9e736ae 100644
--- a/Wrap/Swig/libBornAgainCore.i
+++ b/Wrap/Swig/libBornAgainCore.i
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Wrap/swig/libBornAgainCore.i
+//! @file Wrap/Swig/libBornAgainCore.i
//! @brief SWIG interface file for libBornAgainCore
//!
//! Configuration is done in Core/CMakeLists.txt
diff --git a/Wrap/Swig/libBornAgainDevice.i b/Wrap/Swig/libBornAgainDevice.i
index 93a296f71d8226d4505de11386082beb56922f13..b27a4c001e7ce93425fe7e3f0c03d0e707ccc7bf 100644
--- a/Wrap/Swig/libBornAgainDevice.i
+++ b/Wrap/Swig/libBornAgainDevice.i
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Wrap/swig/libBornAgainDevice.i
+//! @file Wrap/Swig/libBornAgainDevice.i
//! @brief SWIG interface file for libBornAgainDevice
//!
//! Configuration is done in Device/CMakeLists.txt
diff --git a/Wrap/Swig/libBornAgainFit.i b/Wrap/Swig/libBornAgainFit.i
index d13da14a0ee7a1c6ef3fa2c29c4378c3cf54036c..67e5e781bfe925e25cd0ce16708c7ae19a215046 100644
--- a/Wrap/Swig/libBornAgainFit.i
+++ b/Wrap/Swig/libBornAgainFit.i
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Wrap/swig/libBornAgainFit.i
+//! @file Wrap/Swig/libBornAgainFit.i
//! @brief SWIG interface file for libBornAgainFit
//!
//! Configuration is done in Fit/CMakeLists.txt
diff --git a/Wrap/Swig/libBornAgainParam.i b/Wrap/Swig/libBornAgainParam.i
index 8aee07f7899f7e8fa168d81da8570ae6c7dc37d2..9fd7783f35ebe29bafc8598b8ec1bffb4987a377 100644
--- a/Wrap/Swig/libBornAgainParam.i
+++ b/Wrap/Swig/libBornAgainParam.i
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Wrap/swig/libBornAgainParam.i
+//! @file Wrap/Swig/libBornAgainParam.i
//! @brief SWIG interface file for libBornAgainParam
//!
//! Configuration is done in Param/CMakeLists.txt
diff --git a/Wrap/Swig/libBornAgainResample.i b/Wrap/Swig/libBornAgainResample.i
index 9c3c9cb6f934369d04341fde13d64c5fd29dbd71..81f040a6e1092ba083804dd3bd16dafdc056d4b3 100644
--- a/Wrap/Swig/libBornAgainResample.i
+++ b/Wrap/Swig/libBornAgainResample.i
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Wrap/swig/libBornAgainResample.i
+//! @file Wrap/Swig/libBornAgainResample.i
//! @brief SWIG interface file for libBornAgainResample
//!
//! Configuration is done in Resample/CMakeLists.txt
diff --git a/Wrap/Swig/libBornAgainSample.i b/Wrap/Swig/libBornAgainSample.i
index 7b488eb7b4dd4481ba61d151f48e4de8d8f9da2e..93705714113b93ff039539221494545638411121 100644
--- a/Wrap/Swig/libBornAgainSample.i
+++ b/Wrap/Swig/libBornAgainSample.i
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Wrap/swig/libBornAgainSample.i
+//! @file Wrap/Swig/libBornAgainSample.i
//! @brief SWIG interface file for libBornAgainSample
//!
//! Configuration is done in Sample/CMakeLists.txt
diff --git a/cmake/configurables/BABuild.h.in b/cmake/configurables/BABuild.h.in
index 68e83932bad36c7057f815f04cf4fa0a379e9ec8..db299ced1956950c9f72183e7c45fbf206fa9320 100644
--- a/cmake/configurables/BABuild.h.in
+++ b/cmake/configurables/BABuild.h.in
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Samples/inc/BABuild.h
+//! @file cmake/configurables/BABuild.h.in
//! @brief Defines functions for access build related info.
//!
//! @homepage http://bornagainproject.org
diff --git a/cmake/configurables/BATesting.h.in b/cmake/configurables/BATesting.h.in
index c7996dcc7bc1b91aeb9c7ff33d0305a5d2deefa1..644541a54b516f6d030c0e3e5feff9358449c18d 100644
--- a/cmake/configurables/BATesting.h.in
+++ b/cmake/configurables/BATesting.h.in
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Samples/inc/BATesting.h
+//! @file cmake/configurables/BATesting.h.in
//! @brief Defines functions for access build related info.
//!
//! @homepage http://bornagainproject.org
diff --git a/cmake/configurables/BAVersion.h.in b/cmake/configurables/BAVersion.h.in
index b9ec1f72995dbcce88b7c1c1f808b4883bfc59dd..7e3cb695b32e1610ac8cef62e3188aa7e80c2b5c 100644
--- a/cmake/configurables/BAVersion.h.in
+++ b/cmake/configurables/BAVersion.h.in
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Samples/inc/BAVersion.h
+//! @file cmake/configurables/BAVersion.h.in
//! @brief Defines functions for access to the package version number.
//!
//! @homepage http://bornagainproject.org