From 046e90cc4a0edd45e561be0bcc7b0194d2a025eb Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Sat, 6 Nov 2021 11:14:48 +0100
Subject: [PATCH] + GUI/Util/EditUtil
---
GUI/Model/Data/ApplicationModels.h | 6 +-
GUI/Model/Data/AxesItems.h | 6 +-
GUI/Model/Data/Data1DViewItem.h | 6 +-
GUI/Model/Data/DataItem.h | 6 +-
GUI/Model/Data/DataItemUtils.h | 6 +-
GUI/Model/Data/DataProperties.h | 6 +-
GUI/Model/Data/DataPropertyContainer.h | 6 +-
GUI/Model/Data/DataViewUtils.h | 6 +-
GUI/Model/Data/DocumentModel.h | 6 +-
GUI/Model/Data/ImportDataInfo.h | 6 +-
GUI/Model/Data/IntensityDataItem.h | 6 +-
GUI/Model/Data/MaskItems.h | 6 +-
GUI/Model/Data/MaskUnitsConverter.h | 6 +-
GUI/Model/Data/PointwiseAxisItem.h | 6 +-
GUI/Model/Data/ProjectionItems.h | 6 +-
GUI/Model/Data/RealDataItem.h | 6 +-
GUI/Model/Data/RealDataModel.h | 6 +-
GUI/Model/Data/SpecularDataItem.h | 6 +-
GUI/Model/Domain/DomainObjectBuilder.h | 6 +-
GUI/Model/Domain/DomainSimulationBuilder.h | 6 +-
GUI/Model/Domain/GUIObjectBuilder.h | 6 +-
GUI/Model/Domain/TransformFromDomain.h | 6 +-
GUI/Model/Fit/FitParameterHelper.h | 6 +-
GUI/Model/Fit/FitParameterItems.h | 6 +-
GUI/Model/Fit/FitParameterProxyModel.h | 6 +-
GUI/Model/Fit/FitSuiteItem.h | 6 +-
GUI/Model/Fit/MinimizerItem.h | 6 +-
GUI/Model/Fit/MinimizerItemCatalog.h | 6 +-
GUI/Model/Fit/ParameterTreeItems.h | 6 +-
GUI/Model/Fit/ParameterTuningModel.h | 6 +-
GUI/Model/Group/DistributionItems.h | 6 +-
GUI/Model/Group/GroupInfo.h | 6 +-
GUI/Model/Group/GroupItem.h | 6 +-
GUI/Model/Group/GroupItemController.h | 6 +-
GUI/Model/Group/ItemCatalog.h | 6 +-
GUI/Model/Group/ItemFactory.h | 6 +-
GUI/Model/Group/SelectionDescriptor.h | 6 +-
GUI/Model/Instrument/BackgroundItems.h | 6 +-
GUI/Model/Instrument/BeamAngleItems.h | 6 +-
GUI/Model/Instrument/BeamDistributionItem.h | 6 +-
GUI/Model/Instrument/BeamItems.h | 6 +-
GUI/Model/Instrument/BeamWavelengthItem.h | 6 +-
GUI/Model/Instrument/DetectorItems.h | 6 +-
GUI/Model/Instrument/FootprintItems.h | 6 +-
GUI/Model/Instrument/InstrumentItems.h | 6 +-
GUI/Model/Instrument/InstrumentLibrary.h | 6 +-
GUI/Model/Instrument/InstrumentModel.h | 6 +-
GUI/Model/Instrument/InstrumentsTreeModel.h | 6 +-
.../Instrument/RectangularDetectorItem.h | 6 +-
.../Instrument/SpecularBeamInclinationItem.h | 6 +-
GUI/Model/Instrument/SphericalDetectorItem.h | 6 +-
GUI/Model/Job/JobItem.h | 6 +-
GUI/Model/Job/JobItemUtils.h | 6 +-
GUI/Model/Job/JobModel.h | 6 +-
GUI/Model/Job/JobModelFunctions.h | 6 +-
GUI/Model/Job/JobQueueData.h | 6 +-
GUI/Model/Job/JobStatus.h | 6 +-
GUI/Model/Job/JobWorker.h | 6 +-
GUI/Model/Job/ParameterTreeUtils.h | 6 +-
GUI/Model/Material/MaterialDataItems.h | 6 +-
GUI/Model/Material/MaterialItem.h | 6 +-
GUI/Model/Material/MaterialItemContainer.h | 6 +-
GUI/Model/Material/MaterialItemUtils.h | 6 +-
GUI/Model/Material/MaterialModel.h | 6 +-
GUI/Model/Material/MaterialModelStore.h | 6 +-
GUI/Model/Project/OutputDataIOService.h | 6 +-
GUI/Model/Project/ProjectDocument.h | 6 +-
GUI/Model/Sample/FTDecayFunctionItems.h | 6 +-
GUI/Model/Sample/FTDistributionItems.h | 6 +-
GUI/Model/Sample/FormFactorItems.h | 6 +-
GUI/Model/Sample/GUIDomainSampleVisitor.h | 6 +-
GUI/Model/Sample/GUIExamplesFactory.h | 6 +-
GUI/Model/Sample/InterferenceItems.h | 6 +-
GUI/Model/Sample/ItemWithMaterial.h | 6 +-
GUI/Model/Sample/ItemWithParticles.h | 6 +-
GUI/Model/Sample/Lattice2DItems.h | 6 +-
GUI/Model/Sample/LayerItem.h | 6 +-
GUI/Model/Sample/LayerRoughnessItems.h | 6 +-
GUI/Model/Sample/MesoCrystalItem.h | 6 +-
GUI/Model/Sample/MultiLayerItem.h | 6 +-
GUI/Model/Sample/ParticleCompositionItem.h | 6 +-
GUI/Model/Sample/ParticleCoreShellItem.h | 6 +-
GUI/Model/Sample/ParticleItem.h | 6 +-
GUI/Model/Sample/ParticleLayoutItem.h | 6 +-
GUI/Model/Sample/SampleListModel.h | 6 +-
GUI/Model/Sample/SampleModel.h | 6 +-
GUI/Model/Sample/SampleValidator.h | 6 +-
GUI/Model/Session/RealLimitsItems.h | 6 +-
GUI/Model/Session/SessionDecorationModel.h | 6 +-
GUI/Model/Session/SessionFlags.h | 6 +-
GUI/Model/Session/SessionGraphicsItem.h | 6 +-
GUI/Model/Session/SessionItem.h | 6 +-
GUI/Model/Session/SessionItemData.h | 6 +-
GUI/Model/Session/SessionItemTags.h | 6 +-
GUI/Model/Session/SessionItemUtils.h | 6 +-
GUI/Model/Session/SessionModel.h | 6 +-
GUI/Model/Session/SessionXML.h | 6 +-
GUI/Model/Session/SimulationOptionsItem.h | 6 +-
GUI/Model/State/SessionData.h | 6 +-
GUI/Model/Trafo/RotationItems.h | 6 +-
GUI/Model/Trafo/TransformationItem.h | 6 +-
GUI/Model/Types/DoubleDescriptor.h | 6 +-
GUI/Model/Types/ItemWithDistribution.h | 6 +-
GUI/Model/Types/UIntDescriptor.h | 6 +-
GUI/Model/Types/VectorDescriptor.h | 6 +-
GUI/Model/Types/VectorItem.h | 6 +-
GUI/Util/ComboProperty.h | 6 +-
GUI/Util/DeserializationException.h | 6 +-
GUI/Util/EditUtil.cpp | 65 +++++++++++++++++++
GUI/Util/EditUtil.h | 32 +++++++++
GUI/Util/Error.h | 6 +-
GUI/Util/GUIHelpers.cpp | 28 --------
GUI/Util/GUIHelpers.h | 11 +---
GUI/Util/ItemDelegateForHTML.h | 6 +-
GUI/Util/LayoutUtils.h | 6 +-
GUI/Util/MessageService.h | 6 +-
GUI/Util/Path.h | 6 +-
GUI/Util/String.h | 6 +-
GUI/Util/mainwindow_constants.h | 6 +-
GUI/View/Edit/DoubleLineEdit.cpp | 1 -
GUI/View/Edit/DoubleLineEdit.h | 6 +-
GUI/View/Edit/DoubleSpinBox.cpp | 4 +-
GUI/View/Edit/DoubleSpinBox.h | 6 +-
GUI/View/FitWidgets/FitActivityPanel.h | 6 +-
GUI/View/FitWidgets/FitLog.h | 6 +-
GUI/View/FitWidgets/FitObjectiveBuilder.h | 6 +-
GUI/View/FitWidgets/FitParameterWidget.h | 6 +-
GUI/View/FitWidgets/FitProgressInfo.h | 6 +-
GUI/View/FitWidgets/FitResultsWidget.h | 6 +-
GUI/View/FitWidgets/FitSessionController.h | 6 +-
GUI/View/FitWidgets/FitSessionManager.h | 6 +-
GUI/View/FitWidgets/FitSessionWidget.h | 6 +-
GUI/View/FitWidgets/FitWorker.h | 6 +-
GUI/View/FitWidgets/FitWorkerLauncher.h | 6 +-
GUI/View/FitWidgets/GUIFitObserver.h | 6 +-
GUI/View/FitWidgets/JobRealTimeToolBar.h | 6 +-
GUI/View/FitWidgets/JobRealTimeWidget.h | 6 +-
GUI/View/FitWidgets/MinimizerSettingsWidget.h | 6 +-
GUI/View/FitWidgets/ParameterTuningDelegate.h | 6 +-
GUI/View/FitWidgets/ParameterTuningWidget.h | 6 +-
GUI/View/FitWidgets/RunFitControlWidget.h | 6 +-
GUI/View/FitWidgets/SliderSettingsWidget.h | 6 +-
GUI/View/ImportDataWidgets/ImportDataUtils.h | 6 +-
.../ImportDataWidgets/RealDataMaskWidget.h | 6 +-
.../ImportDataWidgets/RealDataPresenter.h | 6 +-
.../RealDataPropertiesWidget.h | 6 +-
.../RealDataSelectorWidget.h | 6 +-
.../ImportDataWidgets/RealDataTreeModel.h | 6 +-
.../DepthProbeInstrumentEditor.h | 6 +-
.../DetectorAlignmentEditor.h | 6 +-
GUI/View/InstrumentWidgets/DetectorEditor.h | 6 +-
.../InstrumentWidgets/DistributionEditor.h | 6 +-
.../InstrumentWidgets/DistributionForms.h | 6 +-
GUI/View/InstrumentWidgets/DistributionPlot.h | 6 +-
.../EditDistributionDialog.h | 6 +-
.../InstrumentWidgets/EnvironmentEditor.h | 6 +-
.../FootprintCorrectionEditor.h | 6 +-
GUI/View/InstrumentWidgets/GISASBeamEditor.h | 6 +-
.../InstrumentWidgets/GISASInstrumentEditor.h | 6 +-
.../InclinationAnglesEditor.h | 6 +-
GUI/View/InstrumentWidgets/InstrumentEditor.h | 6 +-
.../InstrumentLibraryEditor.h | 6 +-
.../InstrumentWidgets/InstrumentListModel.h | 6 +-
.../InstrumentWidgets/InstrumentListView.h | 6 +-
GUI/View/InstrumentWidgets/InstrumentView.h | 6 +-
.../InstrumentWidgets/OffSpecularBeamEditor.h | 6 +-
.../OffSpecularInstrumentEditor.h | 6 +-
.../PolarizationAnalysisEditor.h | 6 +-
.../RectangularDetectorEditor.h | 6 +-
.../ResolutionFunctionEditor.h | 6 +-
.../InstrumentWidgets/SpecularBeamEditor.h | 6 +-
.../SpecularInstrumentEditor.h | 6 +-
.../InstrumentWidgets/SphericalAxisEditor.h | 6 +-
.../SphericalDetectorEditor.h | 6 +-
GUI/View/InstrumentWidgets/VectorEditor.h | 6 +-
GUI/View/IntensityDataWidgets/ColorMap.h | 6 +-
.../IntensityDataWidgets/ColorMapCanvas.h | 6 +-
GUI/View/IntensityDataWidgets/ColorMapUtils.h | 6 +-
.../IntensityDataWidgets/FontScalingEvent.h | 6 +-
.../IntensityDataCanvas.h | 6 +-
.../IntensityDataFFTPresenter.h | 6 +-
.../IntensityDataPropertyWidget.h | 6 +-
.../IntensityDataWidget.h | 6 +-
GUI/View/IntensityDataWidgets/Plot1D.h | 6 +-
GUI/View/IntensityDataWidgets/PlotConstants.h | 6 +-
GUI/View/IntensityDataWidgets/PlotEventInfo.h | 6 +-
.../IntensityDataWidgets/PlotStatusLabel.h | 6 +-
.../IntensityDataWidgets/PropertyRepeater.h | 6 +-
.../IntensityDataWidgets/SavePlotAssistant.h | 6 +-
.../IntensityDataWidgets/ScientificPlot.h | 6 +-
.../ScientificPlotEvent.h | 6 +-
GUI/View/JobWidgets/FitComparisonController.h | 6 +-
.../JobWidgets/FitComparisonViewController.h | 6 +-
GUI/View/JobWidgets/FitComparisonWidget.h | 6 +-
GUI/View/JobWidgets/FitComparisonWidget1D.h | 6 +-
GUI/View/JobWidgets/FitFlowWidget.h | 6 +-
GUI/View/JobWidgets/HistogramPlot.h | 6 +-
GUI/View/JobWidgets/JobListModel.h | 6 +-
GUI/View/JobWidgets/JobListView.h | 6 +-
GUI/View/JobWidgets/JobListViewDelegate.h | 6 +-
GUI/View/JobWidgets/JobMessagePanel.h | 6 +-
GUI/View/JobWidgets/JobProgressAssistant.h | 6 +-
GUI/View/JobWidgets/JobPropertiesTableModel.h | 6 +-
GUI/View/JobWidgets/JobPropertiesWidget.h | 6 +-
GUI/View/JobWidgets/JobResultsPresenter.h | 6 +-
GUI/View/JobWidgets/JobSelectorWidget.h | 6 +-
GUI/View/JobWidgets/JobView.h | 6 +-
GUI/View/JobWidgets/JobViewActivities.h | 6 +-
GUI/View/JobWidgets/JobViewFlags.h | 6 +-
GUI/View/Loaders/AutomaticDataLoader1D.h | 6 +-
.../AutomaticDataLoader1DResultModel.h | 6 +-
GUI/View/Loaders/DataLoaderUtil.h | 6 +-
GUI/View/Loaders/QREDataLoader.h | 6 +-
GUI/View/Loaders/QREDataLoaderProperties.h | 6 +-
GUI/View/Loaders/QREDataLoaderResultModel.h | 6 +-
GUI/View/Loaders/UserDefinedDataLoader1D.h | 6 +-
GUI/View/Main/AboutDialog.h | 6 +-
GUI/View/Main/ActionManager.h | 6 +-
GUI/View/Main/AutosaveController.h | 6 +-
GUI/View/Main/MainWindow.h | 6 +-
GUI/View/Main/NewProjectDialog.h | 6 +-
GUI/View/Main/ProjectManager.h | 6 +-
GUI/View/Main/PyImportAssistant.h | 6 +-
GUI/View/Main/SaveService.h | 6 +-
GUI/View/Main/SaveThread.h | 6 +-
GUI/View/MaskWidgets/ColorMapSceneAdaptor.h | 6 +-
GUI/View/MaskWidgets/EllipseView.h | 6 +-
GUI/View/MaskWidgets/ISceneAdaptor.h | 6 +-
GUI/View/MaskWidgets/IShape2DView.h | 6 +-
GUI/View/MaskWidgets/LineViews.h | 6 +-
GUI/View/MaskWidgets/MaskAllView.h | 6 +-
GUI/View/MaskWidgets/MaskContainerView.h | 6 +-
GUI/View/MaskWidgets/MaskDrawingContext.h | 6 +-
GUI/View/MaskWidgets/MaskEditor.h | 6 +-
GUI/View/MaskWidgets/MaskEditorActions.h | 6 +-
GUI/View/MaskWidgets/MaskEditorCanvas.h | 6 +-
GUI/View/MaskWidgets/MaskEditorFlags.h | 6 +-
GUI/View/MaskWidgets/MaskEditorHelper.h | 6 +-
.../MaskWidgets/MaskEditorPropertyPanel.h | 6 +-
GUI/View/MaskWidgets/MaskEditorToolBar.h | 6 +-
GUI/View/MaskWidgets/MaskGraphicsProxy.h | 6 +-
GUI/View/MaskWidgets/MaskGraphicsScene.h | 6 +-
GUI/View/MaskWidgets/MaskGraphicsView.h | 6 +-
GUI/View/MaskWidgets/MaskResultsPresenter.h | 6 +-
GUI/View/MaskWidgets/MaskViewFactory.h | 6 +-
GUI/View/MaskWidgets/PolygonPointView.h | 6 +-
GUI/View/MaskWidgets/PolygonView.h | 6 +-
GUI/View/MaskWidgets/RectangleBaseView.h | 6 +-
GUI/View/MaskWidgets/RectangleView.h | 6 +-
GUI/View/MaskWidgets/RegionOfInterestView.h | 6 +-
GUI/View/MaskWidgets/SizeHandleElement.h | 6 +-
.../MaterialEditor/MaterialEditorDialog.cpp | 6 +-
.../MaterialEditor/MaterialEditorDialog.h | 6 +-
GUI/View/MaterialEditor/MaterialEditorModel.h | 6 +-
.../IntensityDataProjectionsWidget.h | 6 +-
.../ProjectionsWidgets/ProjectionsEditor.h | 6 +-
.../ProjectionsEditorActions.h | 6 +-
.../ProjectionsEditorCanvas.h | 6 +-
GUI/View/ProjectionsWidgets/ProjectionsPlot.h | 6 +-
.../ProjectionsPropertyPanel.h | 6 +-
.../ProjectionsWidgets/ProjectionsToolBar.h | 6 +-
.../ProjectionsWidgets/ProjectionsWidget.h | 6 +-
.../SaveProjectionsAssistant.h | 6 +-
GUI/View/PropertyEditor/ComponentEditor.h | 6 +-
GUI/View/PropertyEditor/ComponentFlatView.h | 6 +-
.../PropertyEditor/ComponentTreeActions.h | 6 +-
GUI/View/PropertyEditor/ComponentTreeView.h | 6 +-
GUI/View/PropertyEditor/ComponentView.h | 6 +-
GUI/View/PropertyEditor/CustomEditors.h | 6 +-
GUI/View/PropertyEditor/GroupInfoBox.h | 6 +-
.../PropertyEditor/MultiComboPropertyEditor.h | 6 +-
.../PropertyEditor/PropertyEditorFactory.h | 6 +-
GUI/View/PropertyEditor/PropertyWidgetItem.h | 6 +-
.../PropertyEditor/SessionModelDelegate.h | 6 +-
GUI/View/PropertyEditor/TestComponentView.h | 6 +-
GUI/View/RealSpaceWidgets/IPositionBuilder.h | 6 +-
.../RealSpaceWidgets/Particle3DContainer.h | 6 +-
.../RealSpace2DParacrystalUtils.h | 6 +-
GUI/View/RealSpaceWidgets/RealSpaceActions.h | 6 +-
GUI/View/RealSpaceWidgets/RealSpaceBuilder.h | 6 +-
.../RealSpaceWidgets/RealSpaceBuilderUtils.h | 6 +-
GUI/View/RealSpaceWidgets/RealSpaceCanvas.h | 6 +-
.../RealSpaceMesoCrystalUtils.h | 6 +-
GUI/View/RealSpaceWidgets/RealSpaceModel.h | 6 +-
.../RealSpacePositionBuilder.h | 6 +-
GUI/View/RealSpaceWidgets/RealSpaceToolBar.h | 6 +-
GUI/View/RealSpaceWidgets/RealSpaceView.h | 6 +-
GUI/View/RealSpaceWidgets/RealSpaceWidget.h | 6 +-
GUI/View/RealSpaceWidgets/TransformTo3D.h | 6 +-
GUI/View/SampleDesigner/ConnectableView.h | 6 +-
GUI/View/SampleDesigner/DesignerMimeData.h | 6 +-
GUI/View/SampleDesigner/DesignerScene.h | 6 +-
GUI/View/SampleDesigner/DesignerView.h | 6 +-
GUI/View/SampleDesigner/FormLayouter.h | 6 +-
GUI/View/SampleDesigner/GroupBoxCollapser.h | 6 +-
GUI/View/SampleDesigner/ILayerView.h | 6 +-
GUI/View/SampleDesigner/IView.h | 6 +-
GUI/View/SampleDesigner/InterferenceForm.h | 6 +-
GUI/View/SampleDesigner/InterferenceViews.h | 6 +-
GUI/View/SampleDesigner/ItemTreeView.h | 6 +-
GUI/View/SampleDesigner/LayerEditorUtils.h | 6 +-
GUI/View/SampleDesigner/LayerForm.h | 6 +-
.../LayerOrientedSampleEditor.h | 6 +-
GUI/View/SampleDesigner/LayerView.h | 6 +-
GUI/View/SampleDesigner/MaterialInplaceForm.h | 6 +-
GUI/View/SampleDesigner/MesoCrystalForm.h | 6 +-
GUI/View/SampleDesigner/MesoCrystalView.h | 6 +-
GUI/View/SampleDesigner/MultiLayerForm.h | 6 +-
GUI/View/SampleDesigner/MultiLayerView.h | 6 +-
GUI/View/SampleDesigner/NodeEditor.h | 6 +-
.../SampleDesigner/NodeEditorConnection.h | 6 +-
GUI/View/SampleDesigner/NodeEditorPort.h | 6 +-
.../SampleDesigner/ParticleCompositionForm.h | 6 +-
.../SampleDesigner/ParticleCompositionView.h | 6 +-
.../SampleDesigner/ParticleCoreShellForm.h | 6 +-
.../SampleDesigner/ParticleCoreShellView.h | 6 +-
GUI/View/SampleDesigner/ParticleForm.h | 6 +-
GUI/View/SampleDesigner/ParticleLayoutForm.h | 6 +-
GUI/View/SampleDesigner/ParticleLayoutView.h | 6 +-
GUI/View/SampleDesigner/ParticleView.h | 6 +-
GUI/View/SampleDesigner/RealSpacePanel.h | 6 +-
.../SampleDesigner/SampleEditorCommands.h | 6 +-
.../SampleDesigner/SampleEditorController.h | 6 +-
GUI/View/SampleDesigner/SampleListView.h | 6 +-
.../SampleDesigner/SamplePropertyWidget.h | 6 +-
GUI/View/SampleDesigner/SampleToolBar.h | 6 +-
GUI/View/SampleDesigner/SampleToolBox.h | 6 +-
.../SampleDesigner/SampleToolBoxGroupView.h | 6 +-
.../SampleDesigner/SampleToolBoxTreeWidget.h | 6 +-
GUI/View/SampleDesigner/SampleTreeWidget.h | 6 +-
GUI/View/SampleDesigner/SampleViewAligner.h | 6 +-
GUI/View/SampleDesigner/SampleViewFactory.h | 6 +-
GUI/View/SampleDesigner/ScriptPanel.h | 6 +-
.../SampleDesigner/SelectionContainerForm.h | 6 +-
GUI/View/SampleDesigner/TransformationView.h | 6 +-
GUI/View/SampleDesigner/ViewTypes.h | 6 +-
GUI/View/SampleDesigner/WidgetMoverButton.h | 6 +-
.../SimulationWidgets/PythonScriptWidget.h | 6 +-
GUI/View/SpecularDataWidgets/Plot1DCanvas.h | 6 +-
.../SpecularDataWidgets/SpecularDataCanvas.h | 6 +-
.../SpecularDataImportWidget.h | 6 +-
.../SpecularDataWidgets/SpecularDataWidget.h | 6 +-
GUI/View/SpecularDataWidgets/SpecularPlot.h | 6 +-
.../SpecularDataWidgets/SpecularPlotCanvas.h | 6 +-
GUI/View/Toplevel/ImportDataView.h | 6 +-
GUI/View/Toplevel/ProjectSettingsView.h | 6 +-
GUI/View/Toplevel/SampleView.h | 6 +-
GUI/View/Toplevel/SessionModelView.h | 6 +-
GUI/View/Toplevel/SimulationView.h | 6 +-
GUI/View/Toplevel/TestView.h | 6 +-
GUI/View/Toplevel/WelcomeView.h | 6 +-
GUI/Widget/Common/AdjustingScrollArea.h | 6 +-
GUI/Widget/Common/DesignerHelper.h | 6 +-
GUI/Widget/Common/DockWidgetInfo.h | 6 +-
GUI/Widget/Common/DocksController.h | 6 +-
GUI/Widget/Common/InfoPanel.h | 6 +-
GUI/Widget/Common/InfoPanelToolBar.h | 6 +-
GUI/Widget/Common/ItemComboToolBar.h | 6 +-
GUI/Widget/Common/ItemComboWidget.h | 6 +-
GUI/Widget/Common/ItemSelectorWidget.h | 6 +-
GUI/Widget/Common/ItemStackPresenter.h | 6 +-
GUI/Widget/Common/ItemStackWidget.h | 6 +-
GUI/Widget/Common/ItemViewOverlayButtons.h | 6 +-
GUI/Widget/Common/ModelTreeView.h | 6 +-
GUI/Widget/Common/ScientificSpinBox.h | 6 +-
GUI/Widget/Common/SessionItemController.h | 6 +-
GUI/Widget/Common/SessionItemWidget.h | 6 +-
GUI/Widget/Common/StatusLabel.h | 6 +-
GUI/Widget/Common/StyleUtils.h | 6 +-
GUI/Widget/Common/StyledToolBar.h | 6 +-
GUI/Widget/Common/UpdateTimer.h | 6 +-
GUI/Widget/Common/detailsbutton.h | 6 +-
GUI/Widget/Common/detailswidget.h | 6 +-
GUI/Widget/Info/CautionSign.h | 6 +-
GUI/Widget/Info/CautionSignWidget.h | 6 +-
GUI/Widget/Info/ComboSelectorDialog.h | 6 +-
GUI/Widget/Info/DetailedMessageBox.h | 6 +-
GUI/Widget/Info/OverlayLabelController.h | 6 +-
GUI/Widget/Info/OverlayLabelWidget.h | 6 +-
GUI/Widget/Info/ProjectLoadProblemDialog.h | 6 +-
GUI/Widget/Info/PythonSyntaxHighlighter.h | 6 +-
Tests/Unit/GUI/Utils.cpp | 2 +-
Tests/Unit/GUI/Utils.h | 2 +-
Wrap/Swig/libBornAgainBase.i | 2 +-
Wrap/Swig/libBornAgainCore.i | 2 +-
Wrap/Swig/libBornAgainDevice.i | 2 +-
Wrap/Swig/libBornAgainFit.i | 2 +-
Wrap/Swig/libBornAgainParam.i | 2 +-
Wrap/Swig/libBornAgainResample.i | 2 +-
Wrap/Swig/libBornAgainSample.i | 2 +-
cmake/configurables/BABuild.h.in | 2 +-
cmake/configurables/BATesting.h.in | 2 +-
cmake/configurables/BAVersion.h.in | 2 +-
393 files changed, 1239 insertions(+), 1176 deletions(-)
create mode 100644 GUI/Util/EditUtil.cpp
create mode 100644 GUI/Util/EditUtil.h
diff --git a/GUI/Model/Data/ApplicationModels.h b/GUI/Model/Data/ApplicationModels.h
index 5f5ddebfd81..b910e969335 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 20e3d1f736b..10507ea3932 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 4230ef528ca..9126912840d 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 8de12daada6..bb73d4b2f69 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 a09f0ca951a..61060eb0743 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 6e8264bd018..acceccf9ae9 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 b68443525d8..2be645fa587 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 071ef1a0d10..08b8346be5b 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 97cc1ebbcfa..c8b2afb0328 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 8031c598999..1111a7bb3f3 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 cff59e98a49..08f256990c1 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 1063dcbcd23..1e145ac7763 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 5d0bdaef2d1..6a177baf607 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 4b6fcdb05e9..32277a9bc88 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 9ce72201315..37fbaa39a49 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 5c9f0373a28..c6f91b0efc2 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 5549fc91305..5374ab9d13f 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 1b45fcf9f4f..e3defcd35b8 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 64076bd408c..43bbad2fca1 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 dd79e78fc8f..30c20c07e56 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 09b7ca693ae..ca03e936c5f 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 19963fe5c3d..50dfa6b401b 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 6138f8a0c4b..7709ca01f73 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 8aaeb63dcd4..87f6ab85004 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 a426d4da785..5f47ab1a486 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 737d88401be..ebd8f58ff12 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 9f9bb92f4ef..2c5b3483fb4 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 080436f50db..c2ff0daadb0 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 93d0d9b7935..f293defdd03 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 2595bd81993..d0375c46a4a 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 d64b9f55d47..f846f9fb9fb 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 a34e147ddb8..0657ef5b6ef 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 902565f942b..26a99685c45 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 db61c0dbaf3..2d5faa96340 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 6e2d1258206..29923cbb789 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 2e57710e1df..a99c6a17b8d 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 51a84cc05ac..54ac83313ae 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 bd5ca13f958..1af041e96e5 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 0b5d9bc4488..a18cf25bfc3 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 a1a588d7e13..bab439b3a02 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 ab6cc2516d0..92b43a681e1 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 e0b1b4ac0e6..499c51137e5 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 392c57cc9b2..7bf353ed1c3 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 45fedb0edfa..0610f0170fc 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 930d2b6ca79..48add155e12 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 c3946c5fb90..d20bb567b7d 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 c0aedc76897..79baea51066 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 830683b9a0d..e481b23b64d 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 dd11aceb6cf..080f9ed1d9e 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 b264f71d49b..68818afc763 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 ac75ab63004..c5f50bfa83e 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 36c6fc1844b..ffdaedd0d7f 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 65cd11b714f..417c1515a52 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 9501f1fab52..070e5f2e56c 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 4df718a6346..8b62568cdd8 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 1dcdaff6f40..881a096a72f 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 cb8dc9369a3..80fa5768d9e 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 4d0d8f091c1..d293de018b8 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 17ce32c469d..6317d8d6555 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 415307ab977..ea25e70dd75 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 3639e8be13f..625407d2a58 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 edbb5215cea..92e25977516 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 45d74294358..6e498c660e1 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 a04486e7325..a88ce27b825 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 7380d3791ee..8af46ae41f9 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 a2959184659..ac3ce190929 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 bc9206a9a6a..6c2380f34d2 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 5f6352b0494..3aa44f818e6 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 1d5b03ff04c..123ff7da402 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 13dfb408da2..69840f57bcb 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 92ca4af8486..8d1824eef29 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 13a43795fc9..3536f1667ec 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 3e0e959d80d..2560eb90df6 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 18054d9bf3c..99b89c8be3a 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 cf33a37be68..1de1dae42f6 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 1fdd8636203..127768b3dab 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 2da1bc96253..fca108f11d3 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 3e391293e18..cad52936ea9 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 67af48135fe..36a8a6b9510 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 7b6a9de5987..29dec2597ec 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 4e5f2d676b8..d4f850f203c 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 b075cf17cab..713212b85e8 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 38fec55a7da..a87a71aa2ba 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 5168d459296..896271fb5bf 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 ce40b19d38f..e5cdbce6812 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 e6e34dfc58d..88f773864bd 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 ac147f71be3..22e6491ddd9 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 f9d51800a96..1283fb2ceec 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 27115e9fc43..ae8297fa573 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 ce3f8a69f35..fc2137df920 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 15b902a4643..28ce7cda63b 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 79a9a28c187..c6967207153 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 a8d4b653557..b047ea37841 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 78c25e33412..b10d6c1c349 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 7ea1b61310b..ceb523ca9a7 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 a33cd5a3f23..fcda02e72a6 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 0b6280423a6..776c4162f05 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 1cc0d8d9af9..983351aca8e 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 c6101b1e26a..240859f5e83 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 42ccdb5733d..6256ec6302f 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 874eaa85e5b..bb35832943f 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 f28f4499d64..690daf38750 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 edd45ce4406..cd9acbd97a6 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 6ff3a5d6a56..5f1ea7560e4 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 d8e0b164d05..46eb6b17ba2 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 c6aaff63a0b..5ee7bff29ec 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 a2ec29e0b4c..92aec0fdd92 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 b88c600304f..f55df8f36a2 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 00000000000..93bceca87cc
--- /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 00000000000..3cacdf90f28
--- /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 2c849893b84..3ae3a39a392 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 71ec7c23bd4..d88b4adbf28 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 fa8b6c8b575..fafc6f21dba 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 517724ef618..33355ccab5c 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 5e6722a9a8d..343ea025cf0 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 8315e45fa12..11df280cb88 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 af7314ee761..2612704d79c 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 7828f78349a..21706160d32 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 ed704b659f2..0e6bc68e786 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 353fc1da467..97d4bccddce 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 5fcdde6db60..24135b954ab 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 94169d9d513..b47a7f21361 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 0dabd83bc62..8b9d0629d65 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 26658df258a..8be98f2c4b5 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 12b6c24f9ba..ce078a6ada0 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 2931c8bbcfd..a527c88c499 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 5acdb726d93..20ad611deeb 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 c30e2a66228..c74c0199b76 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 6c12badb472..68a436470d7 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 d4ef9b0f5cb..0b77c066b2a 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 6793837b429..564181b25f9 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 9424ac08626..792ac69db52 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 f33d3a824b8..e354e7a1499 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 0c5c1f09f83..27b32b32c15 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 efbf482c05a..bf92d41acde 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 f1c83663e87..c263cf2c3ad 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 44795f702c2..40f89c47913 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 87758a62f7c..9c5c5d77f0b 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 a80b7eddf22..84f2f596c5e 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 3e10f055ddc..a0d9dfa71bf 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 fe0365d2957..efa08d14c0c 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 91e517ed1e3..009ea18864e 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 6fba9039c92..4422de23972 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 0f5cef60b17..12d1374c303 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 5e2612bd294..06b41a2ce2b 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 550af35f3bb..52317a238de 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 ef1f0fc20e7..72db98a61b1 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 4e15c5656cd..3e8d7ef3803 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 38b89f3279e..554ee3be6cc 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 0fafdc04fe8..716fcbaac4c 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 cbdbe6247ef..65b24b3aaed 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 164d667d19f..7c3d34f70aa 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 3887929354f..dc95c6ce493 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 78add73a15c..db13dcb98ef 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 1b46b44818d..1e5a82822a4 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 5c5134f2e0a..36baac5b0cf 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 7cdc39ae1b0..00bb7895c64 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 a5d51ce4f50..60d2c35bce1 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 c325556e3a3..51359fede84 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 7ba112424b2..babd65584c0 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 fee1177f803..6d0dbd9403f 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 31a7a42497f..0f537eda457 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 a1925286f94..8cbbb6679ef 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 9ac2bfe687c..8ee5afafa28 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 ce72dac6a3e..ef163ecc29e 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 c363a6044e7..259f3e414fd 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 7fc2f87af9e..4a76c8466fe 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 210867e4a80..00ed5684a2c 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 2f9e6c251ea..f73636cf980 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 77f09199cb8..49ee3a3bc43 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 33f6e9bdc49..c93cb5aef8d 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 eb5a88128f8..b7814e6f3fa 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 b470943ed3f..88a7045fd8c 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 ee2d86d586f..08e1fc8db63 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 5b48921c9cd..e142ebe16c5 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 7de9245f88b..40fc9aaa946 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 94a486d8d6c..77eb352fcfc 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 bb078c3f11c..7e3595ac261 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 441b87d63c9..ffac46f8d73 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 e3365e5050a..b00f2bc7f82 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 7f0f0c02b6f..eea7a876c88 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 84741e7fd9d..c785ea5676e 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 8d9e01b957e..89b71b2b473 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 487bc11596f..51a97430d9f 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 d6548440cd0..7c2f5cfc28b 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 6545ba3aef1..615415c522d 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 cb41dfba17d..cb5d1496853 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 3bdd4e3f75e..1521b1a8c5c 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 104031743e9..f28f6b96592 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 c03feae9d22..c1e808f78b0 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 7a521742981..684eec0145e 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 eeca1e03a58..8f2ace3a813 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 ce63f3feb23..b0ebb93bf1a 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 53f53b94c09..4b9e2927a10 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 fd5e4963417..fc4c67d833f 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 e3d6fa31515..85f11e1563a 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 98305ba43fe..5b2fa155552 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 e54b565daf8..04037c612df 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 74f094a045c..0176bc6c93d 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 d1b24c6f9d4..6bee868eb47 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 863d7ff7a5d..d4977b3b82c 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 89db3d674e6..458a35cbd7a 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 b0785977100..f21e4aeb065 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 feafb033ed0..7c6e4aad553 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 6f9718cbfce..1d486fbcaf4 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 8891332b29e..e0d40b1eacb 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 89211fad5c0..1fd0af0c02a 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 b1c6cf77fb6..99cee6f576b 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 2bb470a5b55..ae7b5cd22c3 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 a963dc52d97..084abe27d23 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 820d477373c..8ef6696949a 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 59edf20e484..20da94e90a7 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 56a84ade0ac..1d0a7a81d3d 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 95e2d2fc9e9..d13c489ed51 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 b9d321b48e9..e5bbd679b67 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 1f1660fe10e..269ca41ea47 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 00ffeb22b96..8fba7b885e8 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 b7ba1d95a65..5511848037e 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 08fd4fd6fbe..777bb5b5e10 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 870adda05a1..f356f77d160 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 64c83fa5c34..ebab7152622 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 2654a9b9189..0f6f69078ea 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 fd093ab6057..5d0e564ffc5 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 a1e20d39539..d345d30ece5 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 80da903c42e..83202ea9b07 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 4bb85b44693..1bdd2e5ecfe 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 fb76d2302dd..7ae9c2cdb0d 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 a13bc3da597..c4665cf4896 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 96d6c1effb1..b6e86d3b7b2 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 7b34274f802..b5340804fbd 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 19c7f76b922..c794fa54b9a 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 33e587f64e5..731a4fe00cd 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 dba8e8a123a..b9db8c88b15 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 1fdac346cd4..313d1dc90fd 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 1b3bace2d1a..b42263de6c4 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 3680f9dae18..b9081d47f48 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 4a29808341a..dd2615138cf 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 e193c0dc269..5fdf9173fb2 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 d2819f11f16..e1af695381c 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 a2899685e75..d6627d5a3a7 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 e2f49e3c56f..bbe17efe368 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 4b6e2ecbd59..c2c26af32b2 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 c78ce847137..d41b7a91617 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 dd06058681e..68ff35fa069 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 9d5b57c42b6..e8851c1e4dd 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 19b05b63dd0..4e50f9979dc 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 ef9c01c04d9..ffb9c3f6e69 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 b76965ac31f..2fe3c0df9ce 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 25a9243652c..d22b907934c 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 b13eff4bca0..3fe0ba41750 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 bafcf2433f6..6a11a1dc2d6 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 2d8b6da1850..5885722d57e 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 37eb0de00aa..8bd012e5e76 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 0e41a1d1596..447b88a507f 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 187b263c81d..87fada4c49a 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 844c6e977d6..21afed5af21 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 765b21e0593..2b09bffdd0c 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 7256db9d64f..19b5d30b4d3 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 ab0b287ebf2..671c9a4300c 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 2c1c2f55dea..68944d3b10c 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 378a019ff92..2ffa8562961 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 055855e74b3..927cbed7efb 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 e68727360ec..4726b5c2946 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 791c2f5bf71..6c6827c8000 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 899004845a2..1bfac995234 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 de2490c7ba5..015dace2960 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 2f646023a6e..b3c3275c837 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 7a7e77af204..20dcbcb8534 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 336eb32b52c..91fa662aa5f 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 36a43af0ccc..49242add3ef 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 70441d335aa..a38f79e507f 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 7e71d4478cd..0db4d93c6a7 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 8a29675df1a..38a9a62c0ed 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 bbc2b417f0e..06f3c68caf7 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 530cbc9f423..c8dd372bb4d 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 eed74fab8f3..ac88c68c7ad 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 d3f5d4ffc0f..8226c38f42b 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 2a5bdd1b6a9..bd00d04d3ca 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 60ce3df4619..b45d4d51969 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 5916769bb30..bee59b854af 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 c57d1e122e7..29a5ce025d0 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 0e1d44d4695..37e09b003e0 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 21aa8104f7d..d75c91f7681 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 fc664330425..31b87fac904 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 5058c784f83..82ef9f49ca7 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 9018dad4469..7de4e9b9c43 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 09e85df7ee7..bb9cfa9df72 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 b11af78e43f..9982518c087 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 a9456bf9d95..122fd57e7e0 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 e378f3ae9ad..799ae7a0d22 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 effb4e455ac..769f97369ee 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 c055d84f248..c616058e3fe 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 6eb50e07fcd..959f24fabc5 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 78e95a70da6..4926e102732 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 d74c00124dc..9bcd416b53f 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 660a79d2e89..3d771a07972 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 5c7e2884873..c048c13cab1 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 e780e2b4605..c9db999a80e 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 35e63a34ff0..343d08af4bc 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 f4a0981d4ff..209ee127785 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 3abc68ec10e..52fde7d7264 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 7ddf2376a46..1832f309c65 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 975b7018472..0a11350d6f4 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 464402cd08c..06f1cabbdc8 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 03035d71af0..0d1faa4fc12 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 98651a19b40..8fed905d941 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 aeeedae45bd..19ecbef731a 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 bd5eac4fb98..a4e8bd67a2f 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 4422701517d..13c51c85cdc 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 1fcc560de99..f1631864f6e 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 8de74e6be79..1ec66a1b85d 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 0dd79f03b74..13944098013 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 ec4d1efef69..748e7e21e3f 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 28b0ebad364..1aa4c46ae00 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 8526641c9ef..bacd010e92b 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 9195b3a9f20..81dec5402f1 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 c0dd82eb471..fea336fa46f 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 22139972bdb..2eabb3b35e8 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 352472b2d5f..e342421b4c4 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 f621d35095e..8b5cdaba630 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 bfbd9685ac9..e333912078f 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 d6df9d9f7ce..e7641b1e77e 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 977d34e3af0..8134098ee10 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 d6825bfa1e2..82fd32478b2 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 fd71f0f143d..3e38586ea57 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 60f5855b446..5746da83e52 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 5cb7ac8326b..2daf95e4b87 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 8b367ee74f2..3d30df0f46f 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 52290f766b5..357e93453b9 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 a62d4052c43..0d5659e4e0f 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 ab40ad653d0..37dc84f09f9 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 a0e8972086b..4a33db1a184 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 1ea62acb95e..0b3c5ed87cb 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 da59ba759e8..75ee5daad1f 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 285fd154953..13cc712c4af 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 2023f877038..716dc0eadcd 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 52bd3d6bf88..1b4fa1217f1 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 58f06ff9101..523f90c92cb 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 6f359f97ab2..b9adb5bc00c 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 7b8c3ba9577..c647e45efa4 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 00dc92fde85..6eb36c642fa 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 f98499c817c..26f20938f0d 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 b286c8f71aa..0f6ea858e0a 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 9211e9c49d2..316ea500c54 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 14b9adcb707..4bf0579f8c1 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 4f152cbaffb..a73c0761a9d 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 d7d92d54eb0..36442e00fa9 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 60b893b11c2..7b44893c187 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 66b7bb3572b..773f3adb655 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 49f26bb84e7..8ceb8792f37 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 c6bd4398bc0..ce49ad398f2 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 ca14ed814d7..aa37611e570 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 ccc724050fb..30f0de4d306 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 7178af7d626..6f1cca86861 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 f5bac1760b4..85342fe351c 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 335f66151a8..215e22a860f 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 bef3b01c3ce..ea97e276cda 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 0f5e81cd015..bcc5082f7b7 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 bfc7a813b46..cbe459ff522 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 e2acaa929f0..b44245932a1 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 758cc07e677..4760091a807 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 291c82efb16..575477bf10a 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 92ec2629898..1f7e5c3b14c 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 ec055d05518..e158e2cbf86 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 642304b663d..9e47cafeb1a 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 0993c8499ca..dffb2d6c4e8 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 7417e06256c..b7ecebcb3b8 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 dcba12cc657..6463d1420fc 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 99f865bf1ae..3ed8a9082b7 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 9abdb82cb34..9ead147c741 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 3be32eb6de1..f2d14934f17 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 ba475700dcd..73df8ce59b7 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 9840a4f37b5..04d14f5fa64 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 4eb4a3e0e82..4cdb85799a9 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 53b22a9cc21..18110fdce3b 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 34b23b71a7d..7ae4217e57e 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 1fc7a36e1d3..d812ed37ebc 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 429a1b735e4..9aa6491fea0 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 76d4e00652e..86370127c1e 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 993aa0176a0..465173c8166 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 bf14021a182..2fcbc518366 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 7078918e29a..f169e56001d 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 2a3abeb152a..c30ae5b7f67 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 42d14c8fbae..4c65257ab78 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 c552d183177..44d1934ad84 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 93a296f71d8..b27a4c001e7 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 d13da14a0ee..67e5e781bfe 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 8aee07f7899..9fd7783f35e 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 9c3c9cb6f93..81f040a6e10 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 7b488eb7b4d..93705714113 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 68e83932bad..db299ced195 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 c7996dcc7bc..644541a54b5 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 b9ec1f72995..7e3cb695b32 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
--
GitLab