From 9e039c6f395ce5166c9d431ef083b32e93014334 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Thu, 11 Jan 2018 09:34:17 +0100
Subject: [PATCH] InstrumentItem.* files renamed to InstrumentItems.*
---
GUI/coregui/Models/DomainObjectBuilder.cpp | 2 +-
GUI/coregui/Models/DomainSimulationBuilder.cpp | 2 +-
GUI/coregui/Models/GUIObjectBuilder.cpp | 2 +-
.../Models/{InstrumentItem.cpp => InstrumentItems.cpp} | 6 +++---
.../Models/{InstrumentItem.h => InstrumentItems.h} | 10 +++++-----
GUI/coregui/Models/InstrumentModel.cpp | 2 +-
GUI/coregui/Models/ItemFactory.cpp | 2 +-
GUI/coregui/Models/JobItem.cpp | 2 +-
GUI/coregui/Models/JobItemUtils.cpp | 2 +-
GUI/coregui/Models/JobModel.cpp | 2 +-
GUI/coregui/Models/JobModelFunctions.cpp | 2 +-
GUI/coregui/Models/ModelPath.cpp | 2 +-
GUI/coregui/Models/TransformFromDomain.cpp | 2 +-
.../Views/ImportDataWidgets/ImportDataAssistant.cpp | 2 +-
.../Views/ImportDataWidgets/LinkInstrumentManager.cpp | 2 +-
.../Views/InstrumentWidgets/DetectorEditorWidget.cpp | 2 +-
.../Views/InstrumentWidgets/DetectorMaskDelegate.cpp | 2 +-
.../InstrumentWidgets/InstrumentComponentsWidget.cpp | 2 +-
.../Views/InstrumentWidgets/InstrumentEditorWidget.cpp | 2 +-
.../SimulationWidgets/SimulationDataSelectorWidget.cpp | 2 +-
Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.cpp | 2 +-
Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.cpp | 2 +-
Tests/UnitTests/GUI/TestDetectorItems.h | 2 +-
Tests/UnitTests/GUI/TestLinkInstrument.h | 2 +-
Tests/UnitTests/GUI/TestProjectDocument.h | 2 +-
Tests/UnitTests/GUI/TestSaveService.h | 2 +-
Tests/UnitTests/GUI/TestTranslations.h | 2 +-
27 files changed, 33 insertions(+), 33 deletions(-)
rename GUI/coregui/Models/{InstrumentItem.cpp => InstrumentItems.cpp} (95%)
rename GUI/coregui/Models/{InstrumentItem.h => InstrumentItems.h} (87%)
diff --git a/GUI/coregui/Models/DomainObjectBuilder.cpp b/GUI/coregui/Models/DomainObjectBuilder.cpp
index f24efa04ab0..2e1de76d616 100644
--- a/GUI/coregui/Models/DomainObjectBuilder.cpp
+++ b/GUI/coregui/Models/DomainObjectBuilder.cpp
@@ -20,7 +20,7 @@
#include "GUIHelpers.h"
#include "IInterferenceFunction.h"
#include "Instrument.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "InterferenceFunctionItems.h"
#include "LayerItem.h"
#include "MultiLayer.h"
diff --git a/GUI/coregui/Models/DomainSimulationBuilder.cpp b/GUI/coregui/Models/DomainSimulationBuilder.cpp
index b3741fb1d7e..b716f830fa2 100644
--- a/GUI/coregui/Models/DomainSimulationBuilder.cpp
+++ b/GUI/coregui/Models/DomainSimulationBuilder.cpp
@@ -20,7 +20,7 @@
#include "GISASSimulation.h"
#include "GUIHelpers.h"
#include "IBackground.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "MultiLayer.h"
#include "MultiLayerItem.h"
#include "SimulationOptionsItem.h"
diff --git a/GUI/coregui/Models/GUIObjectBuilder.cpp b/GUI/coregui/Models/GUIObjectBuilder.cpp
index b98c6c8950d..78e8bc5f44f 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.cpp
+++ b/GUI/coregui/Models/GUIObjectBuilder.cpp
@@ -49,7 +49,7 @@
#include "SphericalDetector.h"
#include "TransformFromDomain.h"
#include "TransformationItem.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "DetectorItems.h"
#include "Units.h"
#include "VectorItem.h"
diff --git a/GUI/coregui/Models/InstrumentItem.cpp b/GUI/coregui/Models/InstrumentItems.cpp
similarity index 95%
rename from GUI/coregui/Models/InstrumentItem.cpp
rename to GUI/coregui/Models/InstrumentItems.cpp
index 71910a450b7..79512e9ff91 100644
--- a/GUI/coregui/Models/InstrumentItem.cpp
+++ b/GUI/coregui/Models/InstrumentItems.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/coregui/Models/InstrumentItem.cpp
-//! @brief Implements class InstrumentItem
+//! @file GUI/coregui/Models/InstrumentItems.cpp
+//! @brief Implements InstrumentItems classes
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
//
// ************************************************************************** //
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "BackgroundItems.h"
#include "BeamItem.h"
#include "BornAgainNamespace.h"
diff --git a/GUI/coregui/Models/InstrumentItem.h b/GUI/coregui/Models/InstrumentItems.h
similarity index 87%
rename from GUI/coregui/Models/InstrumentItem.h
rename to GUI/coregui/Models/InstrumentItems.h
index f9c8efcf74c..2d1cac5e57e 100644
--- a/GUI/coregui/Models/InstrumentItem.h
+++ b/GUI/coregui/Models/InstrumentItems.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/coregui/Models/InstrumentItem.h
-//! @brief Defines class InstrumentItem
+//! @file GUI/coregui/Models/InstrumentItems.h
+//! @brief Defines InstrumentItems classes
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef INSTRUMENTITEM_H
-#define INSTRUMENTITEM_H
+#ifndef INSTRUMENTITEMS_H
+#define INSTRUMENTITEMS_H
#include "SessionItem.h"
@@ -47,4 +47,4 @@ public:
QStringList translateList(const QStringList& list) const override;
};
-#endif // INSTRUMENTITEM_H
+#endif // INSTRUMENTITEMS_H
diff --git a/GUI/coregui/Models/InstrumentModel.cpp b/GUI/coregui/Models/InstrumentModel.cpp
index 80bd7fe8a58..d97daca1e93 100644
--- a/GUI/coregui/Models/InstrumentModel.cpp
+++ b/GUI/coregui/Models/InstrumentModel.cpp
@@ -13,7 +13,7 @@
// ************************************************************************** //
#include "InstrumentModel.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
InstrumentModel::InstrumentModel(QObject *parent)
: SessionModel(SessionXML::InstrumentModelTag, parent)
diff --git a/GUI/coregui/Models/ItemFactory.cpp b/GUI/coregui/Models/ItemFactory.cpp
index 644b2dc07b8..088b79799f6 100644
--- a/GUI/coregui/Models/ItemFactory.cpp
+++ b/GUI/coregui/Models/ItemFactory.cpp
@@ -28,7 +28,7 @@
#include "FormFactorItems.h"
#include "GUIHelpers.h"
#include "GroupItem.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "IntensityDataItem.h"
#include "InterferenceFunctionItems.h"
#include "JobItem.h"
diff --git a/GUI/coregui/Models/JobItem.cpp b/GUI/coregui/Models/JobItem.cpp
index 48727f991f7..16505c27e7a 100644
--- a/GUI/coregui/Models/JobItem.cpp
+++ b/GUI/coregui/Models/JobItem.cpp
@@ -16,7 +16,7 @@
#include "ComboProperty.h"
#include "FitSuiteItem.h"
#include "GUIHelpers.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "IntensityDataItem.h"
#include "JobItemUtils.h"
#include "MultiLayerItem.h"
diff --git a/GUI/coregui/Models/JobItemUtils.cpp b/GUI/coregui/Models/JobItemUtils.cpp
index 60ceb91a492..66b4406a007 100644
--- a/GUI/coregui/Models/JobItemUtils.cpp
+++ b/GUI/coregui/Models/JobItemUtils.cpp
@@ -17,7 +17,7 @@
#include "DomainObjectBuilder.h"
#include "GISASSimulation.h"
#include "GUIHelpers.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "IntensityDataIOFactory.h"
#include "IntensityDataItem.h"
#include "JobItem.h"
diff --git a/GUI/coregui/Models/JobModel.cpp b/GUI/coregui/Models/JobModel.cpp
index 27f0e50827b..d80921bae0b 100644
--- a/GUI/coregui/Models/JobModel.cpp
+++ b/GUI/coregui/Models/JobModel.cpp
@@ -15,7 +15,7 @@
#include "JobModel.h"
#include "FitSuiteItem.h"
#include "GUIHelpers.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "IntensityDataItem.h"
#include "JobItem.h"
#include "JobItemUtils.h"
diff --git a/GUI/coregui/Models/JobModelFunctions.cpp b/GUI/coregui/Models/JobModelFunctions.cpp
index 1c9b302f0ac..fd05c995245 100644
--- a/GUI/coregui/Models/JobModelFunctions.cpp
+++ b/GUI/coregui/Models/JobModelFunctions.cpp
@@ -18,7 +18,7 @@
#include "RealDataItem.h"
#include "IntensityDataItem.h"
#include "FitSuiteItem.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "GUIHelpers.h"
#include "MaskUnitsConverter.h"
#include "DetectorItems.h"
diff --git a/GUI/coregui/Models/ModelPath.cpp b/GUI/coregui/Models/ModelPath.cpp
index 9e2e503a24c..78ff4933f6f 100644
--- a/GUI/coregui/Models/ModelPath.cpp
+++ b/GUI/coregui/Models/ModelPath.cpp
@@ -13,7 +13,7 @@
// ************************************************************************** //
#include "ModelPath.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "JobItem.h"
#include "RectangularDetectorItem.h"
#include "SessionModel.h"
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/coregui/Models/TransformFromDomain.cpp
index 006547b2be2..8bc1dcd05fe 100644
--- a/GUI/coregui/Models/TransformFromDomain.cpp
+++ b/GUI/coregui/Models/TransformFromDomain.cpp
@@ -56,7 +56,7 @@
#include "ResolutionFunctionItems.h"
#include "SphericalDetector.h"
#include "ParameterTreeUtils.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "ResolutionFunction2DGaussian.h"
#include "ParameterUtils.h"
#include "Particle.h"
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
index e6189f58b1b..a90e1da0260 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
@@ -20,7 +20,7 @@
#include "RealDataItem.h"
#include "projectmanager.h"
#include "BornAgainNamespace.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "AxesItems.h"
#include "DetectorItems.h"
#include "SphericalDetectorItem.h"
diff --git a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
index 3a2be39ea3a..61793767833 100644
--- a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
@@ -15,7 +15,7 @@
#include "LinkInstrumentManager.h"
#include "InstrumentModel.h"
#include "RealDataModel.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "RealDataItem.h"
#include "ImportDataAssistant.h"
#include "AxesItems.h"
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
index 876c8d457fc..7fd66c0d913 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
@@ -22,7 +22,7 @@
#include "GroupInfoBox.h"
#include "RectangularDetectorWidget.h"
#include "SphericalDetectorWidget.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "GroupItem.h"
#include "ColumnResizer.h"
#include <QGroupBox>
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
index e08b5e1a014..de7ce0a4b5f 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
@@ -22,7 +22,7 @@
#include "MaskItems.h"
#include "ModelPath.h"
#include "JobItemUtils.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
DetectorMaskDelegate::DetectorMaskDelegate(QObject* parent)
: QObject(parent)
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
index 7a902f3e6c5..54ca839ef83 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
@@ -19,7 +19,7 @@
#include "ColumnResizer.h"
#include "DetectorEditorWidget.h"
#include "DetectorItems.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "GroupItem.h"
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
index b50ffedfd00..57009b868b7 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
@@ -14,7 +14,7 @@
#include "InstrumentEditorWidget.h"
#include "InstrumentComponentsWidget.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "AdjustingScrollArea.h"
#include <QBoxLayout>
#include <QLabel>
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
index cfde6f95b3e..e7876a18276 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
@@ -14,7 +14,7 @@
#include "SimulationDataSelectorWidget.h"
#include "ApplicationModels.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "InstrumentModel.h"
#include "MultiLayerItem.h"
#include "RealDataItem.h"
diff --git a/Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.cpp b/Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.cpp
index e016c843392..1271778ea97 100644
--- a/Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.cpp
+++ b/Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.cpp
@@ -27,7 +27,7 @@
#include "DocumentModel.h"
#include "ParameterTreeUtils.h"
#include "ParameterTreeItems.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "DetectorItems.h"
#include "ModelPath.h"
#include "IntensityDataItem.h"
diff --git a/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.cpp b/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.cpp
index faf30a1551c..49daa67427d 100644
--- a/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.cpp
+++ b/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.cpp
@@ -18,7 +18,7 @@
#include "DocumentModel.h"
#include "GUIHelpers.h"
#include "GUIObjectBuilder.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "InstrumentModel.h"
#include "JobItem.h"
#include "JobModel.h"
diff --git a/Tests/UnitTests/GUI/TestDetectorItems.h b/Tests/UnitTests/GUI/TestDetectorItems.h
index aac36a9f38b..1aae6f85828 100644
--- a/Tests/UnitTests/GUI/TestDetectorItems.h
+++ b/Tests/UnitTests/GUI/TestDetectorItems.h
@@ -2,7 +2,7 @@
#include "RectangularDetectorItem.h"
#include "InstrumentModel.h"
#include "ComboProperty.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "DetectorItems.h"
#include "ConvolutionDetectorResolution.h"
#include "ResolutionFunction2DGaussian.h"
diff --git a/Tests/UnitTests/GUI/TestLinkInstrument.h b/Tests/UnitTests/GUI/TestLinkInstrument.h
index 99c752434d0..0ed31aaddfc 100644
--- a/Tests/UnitTests/GUI/TestLinkInstrument.h
+++ b/Tests/UnitTests/GUI/TestLinkInstrument.h
@@ -1,6 +1,6 @@
#include "google_test.h"
#include "AxesItems.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "InstrumentModel.h"
#include "IntensityDataItem.h"
#include "JobItemUtils.h"
diff --git a/Tests/UnitTests/GUI/TestProjectDocument.h b/Tests/UnitTests/GUI/TestProjectDocument.h
index b0a58fd392b..5aba0954ebe 100644
--- a/Tests/UnitTests/GUI/TestProjectDocument.h
+++ b/Tests/UnitTests/GUI/TestProjectDocument.h
@@ -1,7 +1,7 @@
#include "google_test.h"
#include "ApplicationModels.h"
#include "GUIHelpers.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "InstrumentModel.h"
#include "IntensityDataItem.h"
#include "JobItemUtils.h"
diff --git a/Tests/UnitTests/GUI/TestSaveService.h b/Tests/UnitTests/GUI/TestSaveService.h
index 673f6bdfb92..961891cb423 100644
--- a/Tests/UnitTests/GUI/TestSaveService.h
+++ b/Tests/UnitTests/GUI/TestSaveService.h
@@ -2,7 +2,7 @@
#include "ApplicationModels.h"
#include "AutosaveController.h"
#include "GUIHelpers.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "InstrumentModel.h"
#include "IntensityDataItem.h"
#include "JobItemUtils.h"
diff --git a/Tests/UnitTests/GUI/TestTranslations.h b/Tests/UnitTests/GUI/TestTranslations.h
index 7b30bae58c9..22c466ad6b4 100644
--- a/Tests/UnitTests/GUI/TestTranslations.h
+++ b/Tests/UnitTests/GUI/TestTranslations.h
@@ -2,7 +2,7 @@
#include "BeamDistributionItem.h"
#include "BeamItem.h"
#include "DistributionItems.h"
-#include "InstrumentItem.h"
+#include "InstrumentItems.h"
#include "ModelPath.h"
#include "ParticleItem.h"
#include "RotationItems.h"
--
GitLab