From 6a871efe0fdc25706e91d6edd17f71d9f79f3269 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Fri, 24 Nov 2023 09:58:55 +0100 Subject: [PATCH] rm double blank lines --- App/AppOptions.h | 1 - Base/Util/Assert.h | 2 ++ Device/Data/Datafield.h | 3 +++ Device/IO/IOFactory.cpp | 1 - Fit/Residual/RootResidualFunction.h | 4 ++++ Fit/Residual/RootScalarFunction.h | 4 ++++ Fit/Suite/GSLLevenbergMarquardtMinimizer.cpp | 4 ++++ Fit/Suite/GSLMultiMinimizer.cpp | 4 ++++ Fit/Suite/SimAnMinimizer.cpp | 4 ++++ GUI/Model/Descriptor/DistributionItems.cpp | 1 + GUI/Model/Job/FitParameterLinkItem.h | 1 - GUI/Model/Job/ParameterTreeItems.cpp | 1 + GUI/Support/Style/Style.h | 1 - GUI/Support/Util/MessageService.h | 1 - GUI/Support/Util/Path.h | 1 - GUI/View/Combo/ItemComboToolbar.h | 1 - GUI/View/Dock/DockWidgetInfo.h | 1 - GUI/View/Dock/DocksController.h | 1 - GUI/View/Info/ComboSelectorDialog.h | 1 - GUI/View/Info/DetailedMessageBox.h | 1 - GUI/View/Instrument/GISASInstrumentEditor.cpp | 1 - GUI/View/Item/ItemViewOverlayButtons.h | 1 - GUI/View/Manager/NewProjectDialog.h | 1 - GUI/View/MaterialEditor/MaterialEditorDialog.cpp | 1 - GUI/View/Numeric/DoubleLineEdit.h | 1 - GUI/View/Numeric/DoubleSpinBox.h | 1 + GUI/View/Plotter/StatusLabel.h | 1 - GUI/View/Tool/ActionFactory.h | 1 - GUI/View/Tool/UpdateTimer.h | 1 - GUI/View/Tool/WidgetMoverButton.h | 1 - GUI/View/Tuning/FitParameterWidget.cpp | 1 - GUI/View/Widget/ApplicationSettings.h | 1 - Img3D/Build/PositionBuilders.cpp | 1 - Img3D/View/Camera.h | 1 + PyCore/Embed/PyCore.h | 2 ++ PyCore/Embed/PyInterpreter.cpp | 2 ++ Resample/Element/IElement.h | 1 - Sample/Correlations/Profiles1D.h | 3 +++ Sample/Correlations/Profiles2D.h | 2 ++ Sample/Material/Material.h | 2 ++ Sample/Material/MaterialFactoryFuncs.h | 1 - Sample/Particle/IFormFactor.h | 1 + Sample/Scattering/Rotations.h | 1 - Tests/GTestWrapper/google_test.h | 4 ++++ Tests/Unit/Base/CoordinateTest.cpp | 1 + Tests/Unit/Base/FileSystemUtilsTest.cpp | 1 + Tests/Unit/Base/FixedBinAxisTest.cpp | 1 + Tests/Unit/Base/FrameTest.cpp | 1 + Tests/Unit/Base/PointwiseAxisTest.cpp | 1 + Tests/Unit/Base/SpinMatrixTest.cpp | 1 + Tests/Unit/Base/StringUtilsTest.cpp | 1 + Tests/Unit/Device/BeamFootprintTest.cpp | 1 + Tests/Unit/Device/DatafieldTest.cpp | 1 + Tests/Unit/Device/Detector2DTest.cpp | 1 + Tests/Unit/Device/PolygonTest.cpp | 1 + Tests/Unit/Device/RW2DTest.cpp | 1 + Tests/Unit/Device/Read1DTest.cpp | 1 + Tests/Unit/Device/Read2DTest.cpp | 1 + Tests/Unit/Device/RegionOfInterestTest.cpp | 1 + Tests/Unit/Device/Shape2DTest.cpp | 1 + Tests/Unit/Device/SpectrumTest.cpp | 1 + Tests/Unit/Fit/AttLimitsTest.cpp | 1 + Tests/Unit/Fit/MinimizerOptionsTest.cpp | 1 + Tests/Unit/Fit/MultiOptionTest.cpp | 1 + Tests/Unit/Fit/OptionContainerTest.cpp | 1 + Tests/Unit/Fit/ParameterTest.cpp | 1 + Tests/Unit/Fit/ParametersTest.cpp | 1 + Tests/Unit/Fit/RealLimitsTest.cpp | 1 + Tests/Unit/GUI/Comparators.cpp | 1 + Tests/Unit/GUI/TestAutosaveController.cpp | 1 + Tests/Unit/GUI/TestComboProperty.cpp | 1 + Tests/Unit/GUI/TestDatafilesModel.cpp | 1 + Tests/Unit/GUI/TestFitParameterModel.cpp | 1 + Tests/Unit/GUI/TestFormFactorItems.cpp | 1 + Tests/Unit/GUI/TestGUI.cpp | 1 + Tests/Unit/GUI/TestHelpers.cpp | 1 + Tests/Unit/GUI/TestInstrumentItems.cpp | 1 + Tests/Unit/GUI/TestJobModel.cpp | 1 + Tests/Unit/GUI/TestLinkInstrument.cpp | 1 + Tests/Unit/GUI/TestMaterialItems.cpp | 1 + Tests/Unit/GUI/TestMessageService.cpp | 1 + Tests/Unit/GUI/TestProfileItems.cpp | 1 + Tests/Unit/GUI/TestProjectDocument.cpp | 1 + Tests/Unit/GUI/TestScientificSpinBox.cpp | 1 + Tests/Unit/GUI/TestString.cpp | 1 + Tests/Unit/GUI/TestUpdateTimer.cpp | 1 + Tests/Unit/Numeric/BesselTest.cpp | 1 + Tests/Unit/Numeric/BisectFF.cpp | 2 ++ Tests/Unit/Numeric/FormFactorOtherTest.cpp | 1 + Tests/Unit/Numeric/FormFactorSpecializationTest.cpp | 1 + Tests/Unit/Numeric/FormFactorSymmetryTest.cpp | 1 + Tests/Unit/Numeric/FourierTransformTest.cpp | 1 + Tests/Unit/Numeric/MultiQTest.cpp | 1 + Tests/Unit/Numeric/SpecialFunctionsTest.cpp | 1 + Tests/Unit/Param/ParameterDistributionTest.cpp | 1 + Tests/Unit/Resample/KzComputationTest.cpp | 1 + Tests/Unit/Resample/MaterialTest.cpp | 1 + Tests/Unit/Resample/MultilayerAveragingTest.cpp | 1 + Tests/Unit/Resample/RTTest.cpp | 1 + Tests/Unit/Resample/ZLimitsTest.cpp | 1 + Tests/Unit/Sample/CoreAndShellTest.cpp | 1 + Tests/Unit/Sample/FormFactorBasicTest.cpp | 1 + Tests/Unit/Sample/Lattice2DTest.cpp | 1 + Tests/Unit/Sample/LatticeTest.cpp | 1 + Tests/Unit/Sample/LayerRoughnessTest.cpp | 1 + Tests/Unit/Sample/LayerTest.cpp | 1 + Tests/Unit/Sample/MultiLayerTest.cpp | 1 + Tests/Unit/Sample/ParticleCompositionTest.cpp | 1 + Tests/Unit/Sample/ProfilesTest.cpp | 1 + Tests/Unit/Sample/RotationTest.cpp | 1 + Tests/Unit/Sim/ChiSquaredModuleTest.cpp | 1 + Tests/Unit/Sim/FitObjectiveTest.cpp | 1 + Tests/Unit/Sim/FitObserverTest.cpp | 1 + Tests/Unit/Sim/ObjectiveMetricTest.cpp | 1 + Tests/Unit/Sim/ParticleLayoutTest.cpp | 1 + Tests/Unit/Sim/SimDataPairTest.cpp | 1 + Tests/Unit/Sim/SpecularScanTest.cpp | 1 + Wrap/PythonPackage/src/bornagain_c_ext_dummy.c | 1 + cmake/tests/test_libcerf.cpp | 1 + 119 files changed, 121 insertions(+), 26 deletions(-) diff --git a/App/AppOptions.h b/App/AppOptions.h index 6d85749bbea..b38deb595c1 100644 --- a/App/AppOptions.h +++ b/App/AppOptions.h @@ -22,7 +22,6 @@ #include <boost/program_options/variables_map.hpp> #include <string> - namespace bpo = boost::program_options; //! Handles command line and config file program options diff --git a/Base/Util/Assert.h b/Base/Util/Assert.h index b8bfdaf9132..8379ecfc6bc 100644 --- a/Base/Util/Assert.h +++ b/Base/Util/Assert.h @@ -31,6 +31,7 @@ #include <csignal> #include <iostream> + #define ASSERT(condition) \ if (!(condition)) { \ std::cerr << "Assertion " #condition " failed in " __FILE__ ", line " << __LINE__ \ @@ -48,6 +49,7 @@ #else // BA_DEBUG #include <stdexcept> + #define ASSERT(condition) \ if (!(condition)) \ throw std::runtime_error("BUG: Assertion " #condition " failed in " __FILE__ ", line " \ diff --git a/Device/Data/Datafield.h b/Device/Data/Datafield.h index bee3afaacc1..e452e8a6f36 100644 --- a/Device/Data/Datafield.h +++ b/Device/Data/Datafield.h @@ -16,8 +16,11 @@ #define BORNAGAIN_DEVICE_DATA_DATAFIELD_H #ifdef BORNAGAIN_PYTHON + #include "PyCore/Embed/PyObjectDecl.h" + #endif + #include <memory> #include <string> #include <vector> diff --git a/Device/IO/IOFactory.cpp b/Device/IO/IOFactory.cpp index 1136e8e6008..217f711d0c0 100644 --- a/Device/IO/IOFactory.cpp +++ b/Device/IO/IOFactory.cpp @@ -27,7 +27,6 @@ #include <sstream> #include <stdexcept> - IO::Filetype1D IO::filename2type1D(const std::string& fname) { const std::string ext = ZipUtil::uncompressedExtension(fname); diff --git a/Fit/Residual/RootResidualFunction.h b/Fit/Residual/RootResidualFunction.h index 9496b65d1ca..d842966cd05 100644 --- a/Fit/Residual/RootResidualFunction.h +++ b/Fit/Residual/RootResidualFunction.h @@ -21,11 +21,15 @@ #include "Fit/Minimizer/Types.h" #ifdef _WIN32 + #include <Math/FitMethodFunction.h> + #else #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #include <Math/FitMethodFunction.h> + #pragma GCC diagnostic pop #endif diff --git a/Fit/Residual/RootScalarFunction.h b/Fit/Residual/RootScalarFunction.h index 73927633c11..4e7c3331123 100644 --- a/Fit/Residual/RootScalarFunction.h +++ b/Fit/Residual/RootScalarFunction.h @@ -21,11 +21,15 @@ #include "Fit/Minimizer/Types.h" #ifdef _WIN32 + #include <Math/Functor.h> + #else #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #include <Math/Functor.h> + #pragma GCC diagnostic pop #endif diff --git a/Fit/Suite/GSLLevenbergMarquardtMinimizer.cpp b/Fit/Suite/GSLLevenbergMarquardtMinimizer.cpp index 5fb21a1226b..73839551f6b 100644 --- a/Fit/Suite/GSLLevenbergMarquardtMinimizer.cpp +++ b/Fit/Suite/GSLLevenbergMarquardtMinimizer.cpp @@ -21,12 +21,16 @@ #ifdef _WIN32 #pragma warning(push) #pragma warning(disable : 4267) + #include <Math/GSLNLSMinimizer.h> + #pragma warning(pop) #else #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #include <Math/GSLNLSMinimizer.h> + #pragma GCC diagnostic pop #endif diff --git a/Fit/Suite/GSLMultiMinimizer.cpp b/Fit/Suite/GSLMultiMinimizer.cpp index 42e89c6e8b9..29cad4f7c44 100644 --- a/Fit/Suite/GSLMultiMinimizer.cpp +++ b/Fit/Suite/GSLMultiMinimizer.cpp @@ -19,12 +19,16 @@ #ifdef _WIN32 #pragma warning(push) #pragma warning(disable : 4267) + #include <Math/GSLMinimizer.h> + #pragma warning(pop) #else #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #include <Math/GSLMinimizer.h> + #pragma GCC diagnostic pop #endif diff --git a/Fit/Suite/SimAnMinimizer.cpp b/Fit/Suite/SimAnMinimizer.cpp index b7c1ed616f1..dec7746a0f7 100644 --- a/Fit/Suite/SimAnMinimizer.cpp +++ b/Fit/Suite/SimAnMinimizer.cpp @@ -18,12 +18,16 @@ #ifdef _WIN32 #pragma warning(push) #pragma warning(disable : 4267) + #include <Math/GSLSimAnMinimizer.h> + #pragma warning(pop) #else #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #include <Math/GSLSimAnMinimizer.h> + #pragma GCC diagnostic pop #endif diff --git a/GUI/Model/Descriptor/DistributionItems.cpp b/GUI/Model/Descriptor/DistributionItems.cpp index 3ebf30ef160..583cc18b5a5 100644 --- a/GUI/Model/Descriptor/DistributionItems.cpp +++ b/GUI/Model/Descriptor/DistributionItems.cpp @@ -15,6 +15,7 @@ #include "GUI/Model/Descriptor/DistributionItems.h" #include "GUI/Support/XML/UtilXML.h" #include "Param/Distrib/Distributions.h" + namespace { namespace Tag { diff --git a/GUI/Model/Job/FitParameterLinkItem.h b/GUI/Model/Job/FitParameterLinkItem.h index 5b7d779b062..7f194cb0ad0 100644 --- a/GUI/Model/Job/FitParameterLinkItem.h +++ b/GUI/Model/Job/FitParameterLinkItem.h @@ -19,7 +19,6 @@ #include <QXmlStreamReader> #include <QXmlStreamWriter> - //! Holds link value, accessible from FitparameterModel. class LinkItem : public QObject { Q_OBJECT diff --git a/GUI/Model/Job/ParameterTreeItems.cpp b/GUI/Model/Job/ParameterTreeItems.cpp index 7759a82a048..f9b5b1f683e 100644 --- a/GUI/Model/Job/ParameterTreeItems.cpp +++ b/GUI/Model/Job/ParameterTreeItems.cpp @@ -15,6 +15,7 @@ #include "GUI/Model/Job/ParameterTreeItems.h" #include "Base/Util/Assert.h" #include "GUI/Support/XML/UtilXML.h" + namespace { namespace Tag { diff --git a/GUI/Support/Style/Style.h b/GUI/Support/Style/Style.h index 73bdfcab1a1..ba0288ea68d 100644 --- a/GUI/Support/Style/Style.h +++ b/GUI/Support/Style/Style.h @@ -21,7 +21,6 @@ #include <QTreeView> #include <QWidget> - //! Mostly concerned with fonts namespace GUI::Style { diff --git a/GUI/Support/Util/MessageService.h b/GUI/Support/Util/MessageService.h index d3fa722c030..a32c529349f 100644 --- a/GUI/Support/Util/MessageService.h +++ b/GUI/Support/Util/MessageService.h @@ -20,7 +20,6 @@ #include <QPair> #include <QString> - //! The service to collect messages from different senders. class MessageService { diff --git a/GUI/Support/Util/Path.h b/GUI/Support/Util/Path.h index 10768d94442..50684bf9285 100644 --- a/GUI/Support/Util/Path.h +++ b/GUI/Support/Util/Path.h @@ -18,7 +18,6 @@ #include <QModelIndex> #include <QString> - namespace GUI::Path { QString withTildeHomePath(const QString& path); diff --git a/GUI/View/Combo/ItemComboToolbar.h b/GUI/View/Combo/ItemComboToolbar.h index 8a7036132d5..6cf94d7f22f 100644 --- a/GUI/View/Combo/ItemComboToolbar.h +++ b/GUI/View/Combo/ItemComboToolbar.h @@ -20,7 +20,6 @@ #include <QComboBox> #include <QList> - //! The ItemComboToolbar class is a styled toolbar on top of ItemComboWidget. Contains //! ComboBox to switch ItemComboWidget, and dynamic list of actions, which are updated //! according to current state of ItemComboWidget. diff --git a/GUI/View/Dock/DockWidgetInfo.h b/GUI/View/Dock/DockWidgetInfo.h index 24bb76031ab..3babf276a00 100644 --- a/GUI/View/Dock/DockWidgetInfo.h +++ b/GUI/View/Dock/DockWidgetInfo.h @@ -19,7 +19,6 @@ #include <QWidget> #include <qnamespace.h> - //! Holds information about the widget and its dock. class DockWidgetInfo { diff --git a/GUI/View/Dock/DocksController.h b/GUI/View/Dock/DocksController.h index ac176da2bb4..12f639fb27c 100644 --- a/GUI/View/Dock/DocksController.h +++ b/GUI/View/Dock/DocksController.h @@ -23,7 +23,6 @@ #include <QSize> #include <map> - //! Handles creation and appearance of docked widgets in the context of QMainWindow. It is used for //! SampleView and JobView which are based on QMainWindow. diff --git a/GUI/View/Info/ComboSelectorDialog.h b/GUI/View/Info/ComboSelectorDialog.h index 8f151babed0..b4263c94bc2 100644 --- a/GUI/View/Info/ComboSelectorDialog.h +++ b/GUI/View/Info/ComboSelectorDialog.h @@ -21,7 +21,6 @@ #include <QLabel> #include <QString> - //! A dialog similar to standard QMessageBox with combo box selector. class ComboSelectorDialog : public QDialog { diff --git a/GUI/View/Info/DetailedMessageBox.h b/GUI/View/Info/DetailedMessageBox.h index 30a631b0741..fefdf9719da 100644 --- a/GUI/View/Info/DetailedMessageBox.h +++ b/GUI/View/Info/DetailedMessageBox.h @@ -21,7 +21,6 @@ #include <QString> #include <QTextEdit> - //! A dialog similar to standard QMessageBox intended for detailed warning messages. //! On the contrary to QMessageBox, the dialog has size grip and visible text editor. diff --git a/GUI/View/Instrument/GISASInstrumentEditor.cpp b/GUI/View/Instrument/GISASInstrumentEditor.cpp index 954f9562ffc..2cf3071dc04 100644 --- a/GUI/View/Instrument/GISASInstrumentEditor.cpp +++ b/GUI/View/Instrument/GISASInstrumentEditor.cpp @@ -20,7 +20,6 @@ #include "GUI/View/Instrument/GISASBeamEditor.h" #include "GUI/View/Instrument/PolarizationAnalysisEditor.h" - GISASInstrumentEditor::GISASInstrumentEditor(QWidget* parent, GISASInstrumentItem* instrument) : QWidget(parent) { diff --git a/GUI/View/Item/ItemViewOverlayButtons.h b/GUI/View/Item/ItemViewOverlayButtons.h index a415dee4800..45a36dd6ba3 100644 --- a/GUI/View/Item/ItemViewOverlayButtons.h +++ b/GUI/View/Item/ItemViewOverlayButtons.h @@ -20,7 +20,6 @@ #include <QObject> #include <functional> - class ItemViewOverlayButtons : public QObject { Q_OBJECT public: diff --git a/GUI/View/Manager/NewProjectDialog.h b/GUI/View/Manager/NewProjectDialog.h index 3c4dd3d8084..b2f4b9b8217 100644 --- a/GUI/View/Manager/NewProjectDialog.h +++ b/GUI/View/Manager/NewProjectDialog.h @@ -19,7 +19,6 @@ #include <QLabel> #include <QLineEdit> - //! new project dialog window class NewProjectDialog : public QDialog { Q_OBJECT diff --git a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp index c69f1223a7d..c76c6d3eae7 100644 --- a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp +++ b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp @@ -32,7 +32,6 @@ #include <QSplitter> #include <QVBoxLayout> - MaterialEditorDialog::MaterialEditorDialog(SampleItem* sample, QWidget* parent) : QDialog(parent) , m_sample(sample) diff --git a/GUI/View/Numeric/DoubleLineEdit.h b/GUI/View/Numeric/DoubleLineEdit.h index 066b213f66a..fd612a7bb8e 100644 --- a/GUI/View/Numeric/DoubleLineEdit.h +++ b/GUI/View/Numeric/DoubleLineEdit.h @@ -19,7 +19,6 @@ #include <QDoubleValidator> #include <QLineEdit> - //! LineEdit to edit values in a scientific notation, operating on a DoubleProperty. //! //! In the future it can be enhanced to support units. At the moment, no DoubleProperty with units diff --git a/GUI/View/Numeric/DoubleSpinBox.h b/GUI/View/Numeric/DoubleSpinBox.h index 6fc70783132..cc1c896ce7f 100644 --- a/GUI/View/Numeric/DoubleSpinBox.h +++ b/GUI/View/Numeric/DoubleSpinBox.h @@ -14,6 +14,7 @@ #ifndef BORNAGAIN_GUI_VIEW_NUMERIC_DOUBLESPINBOX_H #define BORNAGAIN_GUI_VIEW_NUMERIC_DOUBLESPINBOX_H + #include "GUI/Model/Descriptor/DoubleProperty.h" #include <QDoubleSpinBox> diff --git a/GUI/View/Plotter/StatusLabel.h b/GUI/View/Plotter/StatusLabel.h index 952fdcd112e..584cd0133c0 100644 --- a/GUI/View/Plotter/StatusLabel.h +++ b/GUI/View/Plotter/StatusLabel.h @@ -18,7 +18,6 @@ #include <QFrame> #include <QPaintEvent> - //! The StatusLabel class shows a single line of text on a white background. Opposite to QLabel, //! if text string is too long for current size, it will be clipped. diff --git a/GUI/View/Tool/ActionFactory.h b/GUI/View/Tool/ActionFactory.h index bb14d7ba728..2e23ae54a67 100644 --- a/GUI/View/Tool/ActionFactory.h +++ b/GUI/View/Tool/ActionFactory.h @@ -21,7 +21,6 @@ #include <QWidget> #include <functional> - //! Factory to create commonly used actions class ActionFactory { public: diff --git a/GUI/View/Tool/UpdateTimer.h b/GUI/View/Tool/UpdateTimer.h index a9f2038f8fd..812ea039192 100644 --- a/GUI/View/Tool/UpdateTimer.h +++ b/GUI/View/Tool/UpdateTimer.h @@ -18,7 +18,6 @@ #include <QObject> #include <QTimer> - //! The UpdateTimer class accumulates update requests during certain period of time, and at //! the end of this period emits special signal. diff --git a/GUI/View/Tool/WidgetMoverButton.h b/GUI/View/Tool/WidgetMoverButton.h index 5ec154be4b8..13e9afe8e9f 100644 --- a/GUI/View/Tool/WidgetMoverButton.h +++ b/GUI/View/Tool/WidgetMoverButton.h @@ -21,7 +21,6 @@ #include <QTimer> #include <QToolButton> - //! Button to move a widget vertically in a layout. //! //! Used for the "move layer" feature in the sample editor. diff --git a/GUI/View/Tuning/FitParameterWidget.cpp b/GUI/View/Tuning/FitParameterWidget.cpp index c0d80885457..5d1e886abef 100644 --- a/GUI/View/Tuning/FitParameterWidget.cpp +++ b/GUI/View/Tuning/FitParameterWidget.cpp @@ -29,7 +29,6 @@ #include <QVBoxLayout> #include <boost/polymorphic_cast.hpp> - FitParameterWidget::FitParameterWidget() : m_treeView(new QTreeView) , m_tuningWidget(nullptr) diff --git a/GUI/View/Widget/ApplicationSettings.h b/GUI/View/Widget/ApplicationSettings.h index 9121d963d6c..244984e78bf 100644 --- a/GUI/View/Widget/ApplicationSettings.h +++ b/GUI/View/Widget/ApplicationSettings.h @@ -20,7 +20,6 @@ #include <QVariant> #include <QWidget> - //! Application wide settings. //! //! Contains settings which the user can change. Also diff --git a/Img3D/Build/PositionBuilders.cpp b/Img3D/Build/PositionBuilders.cpp index 89fcbd8a95e..5f9139af27c 100644 --- a/Img3D/Build/PositionBuilders.cpp +++ b/Img3D/Build/PositionBuilders.cpp @@ -17,7 +17,6 @@ #include "Sample/Aggregate/Interferences.h" #include <random> - namespace { std::vector<std::vector<double>> Generate2DLatticePoints(double l1, double l2, double alpha, diff --git a/Img3D/View/Camera.h b/Img3D/View/Camera.h index ab7bf205287..1bb4b185abe 100644 --- a/Img3D/View/Camera.h +++ b/Img3D/View/Camera.h @@ -21,6 +21,7 @@ #include <QMatrix4x4> #include <QObject> #include <QQuaternion> + namespace Img3D { class Canvas; diff --git a/PyCore/Embed/PyCore.h b/PyCore/Embed/PyCore.h index 37c130c523a..1b634834a1f 100644 --- a/PyCore/Embed/PyCore.h +++ b/PyCore/Embed/PyCore.h @@ -31,6 +31,7 @@ #endif #define PY_SSIZE_T_CLEAN + #include <Python.h> #ifdef INCLUDE_NUMPY @@ -45,6 +46,7 @@ #endif // BORNAGAIN_PYTHON_API_SWIG #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION // to prevent spurious warning + #include <numpy/arrayobject.h> #endif // INCLUDE_NUMPY diff --git a/PyCore/Embed/PyInterpreter.cpp b/PyCore/Embed/PyInterpreter.cpp index d56c36bb687..1a67baecef5 100644 --- a/PyCore/Embed/PyInterpreter.cpp +++ b/PyCore/Embed/PyInterpreter.cpp @@ -28,7 +28,9 @@ References: */ #define INCLUDE_NUMPY // also include Numpy via PyCore + #include "PyCore/Embed/PyCore.h" + #undef INCLUDE_NUMPY #include "Base/Util/Assert.h" diff --git a/Resample/Element/IElement.h b/Resample/Element/IElement.h index 108117dc594..f8c6a709d7d 100644 --- a/Resample/Element/IElement.h +++ b/Resample/Element/IElement.h @@ -20,7 +20,6 @@ #include "Base/Spin/SpinMatrix.h" - class IElement { public: IElement() = default; diff --git a/Sample/Correlations/Profiles1D.h b/Sample/Correlations/Profiles1D.h index 576bfb17ff5..a1ec92d72b4 100644 --- a/Sample/Correlations/Profiles1D.h +++ b/Sample/Correlations/Profiles1D.h @@ -17,8 +17,11 @@ #include "Base/Types/ICloneable.h" #include "Param/Node/INode.h" + #ifndef SWIG + #include "Sample/Correlations/IDistribution1DSampler.h" + #endif // SWIG diff --git a/Sample/Correlations/Profiles2D.h b/Sample/Correlations/Profiles2D.h index ac15be25c8c..8cd34fd55cb 100644 --- a/Sample/Correlations/Profiles2D.h +++ b/Sample/Correlations/Profiles2D.h @@ -21,7 +21,9 @@ using std::numbers::pi; #ifndef SWIG + #include "Sample/Correlations/IDistribution2DSampler.h" + #endif // SWIG diff --git a/Sample/Material/Material.h b/Sample/Material/Material.h index 43a81653335..d6b76c29228 100644 --- a/Sample/Material/Material.h +++ b/Sample/Material/Material.h @@ -23,7 +23,9 @@ #include <vector> #ifndef SWIG + #include "Sample/Material/IMaterialImpl.h" + #endif // SWIG class SpinMatrix; diff --git a/Sample/Material/MaterialFactoryFuncs.h b/Sample/Material/MaterialFactoryFuncs.h index fc4ead6c415..813fba0fac8 100644 --- a/Sample/Material/MaterialFactoryFuncs.h +++ b/Sample/Material/MaterialFactoryFuncs.h @@ -17,7 +17,6 @@ #include "Sample/Material/Material.h" - Material RefractiveMaterial(const std::string& name, double delta, double beta, R3 magnetization = {}); diff --git a/Sample/Particle/IFormFactor.h b/Sample/Particle/IFormFactor.h index faf68de5d1b..229f6450d96 100644 --- a/Sample/Particle/IFormFactor.h +++ b/Sample/Particle/IFormFactor.h @@ -20,6 +20,7 @@ #include <heinz/Vectors3D.h> // not forward declared because of SWIG: + #include "Base/Spin/SpinMatrix.h" #include "Base/Spin/Spinor.h" diff --git a/Sample/Scattering/Rotations.h b/Sample/Scattering/Rotations.h index d29d0fcf65a..d5b4d6ee94d 100644 --- a/Sample/Scattering/Rotations.h +++ b/Sample/Scattering/Rotations.h @@ -20,7 +20,6 @@ #include "Param/Node/INode.h" #include <heinz/Vectors3D.h> - //! Abstract base class for rotations. class IRotation : public ICloneable, public INode { diff --git a/Tests/GTestWrapper/google_test.h b/Tests/GTestWrapper/google_test.h index 5b5cbd2eb0e..d6d32ca3c82 100644 --- a/Tests/GTestWrapper/google_test.h +++ b/Tests/GTestWrapper/google_test.h @@ -22,10 +22,14 @@ #ifdef _WIN32 #pragma warning(push) #pragma warning(disable : 4275) + #include <gtest/gtest.h> + #pragma warning(pop) #else + #include <gtest/gtest.h> + #endif #include <memory> diff --git a/Tests/Unit/Base/CoordinateTest.cpp b/Tests/Unit/Base/CoordinateTest.cpp index c9f2a52ba93..54da4f5eb49 100644 --- a/Tests/Unit/Base/CoordinateTest.cpp +++ b/Tests/Unit/Base/CoordinateTest.cpp @@ -1,4 +1,5 @@ #include "Base/Axis/Coordinate.h" + #include "BATesting.h" #include "Tests/GTestWrapper/google_test.h" diff --git a/Tests/Unit/Base/FileSystemUtilsTest.cpp b/Tests/Unit/Base/FileSystemUtilsTest.cpp index 9593251fe4f..533d745f260 100644 --- a/Tests/Unit/Base/FileSystemUtilsTest.cpp +++ b/Tests/Unit/Base/FileSystemUtilsTest.cpp @@ -1,4 +1,5 @@ #include "BATesting.h" + #include "Base/Util/PathUtil.h" #include "Tests/GTestWrapper/google_test.h" #include <filesystem> diff --git a/Tests/Unit/Base/FixedBinAxisTest.cpp b/Tests/Unit/Base/FixedBinAxisTest.cpp index d85b93deb98..4ea80b4ba78 100644 --- a/Tests/Unit/Base/FixedBinAxisTest.cpp +++ b/Tests/Unit/Base/FixedBinAxisTest.cpp @@ -1,4 +1,5 @@ #include "Base/Axis/MakeScale.h" + #include "Base/Axis/Scale.h" #include "Tests/GTestWrapper/google_test.h" diff --git a/Tests/Unit/Base/FrameTest.cpp b/Tests/Unit/Base/FrameTest.cpp index bc5f8554fd6..a596c541b31 100644 --- a/Tests/Unit/Base/FrameTest.cpp +++ b/Tests/Unit/Base/FrameTest.cpp @@ -1,4 +1,5 @@ #include "Base/Axis/Frame.h" + #include "Base/Axis/FrameUtil.h" #include "Base/Axis/MakeScale.h" #include "Base/Axis/Scale.h" diff --git a/Tests/Unit/Base/PointwiseAxisTest.cpp b/Tests/Unit/Base/PointwiseAxisTest.cpp index 53bc3d17fb4..11e58a2d819 100644 --- a/Tests/Unit/Base/PointwiseAxisTest.cpp +++ b/Tests/Unit/Base/PointwiseAxisTest.cpp @@ -1,4 +1,5 @@ #include "Base/Axis/MakeScale.h" + #include "Base/Axis/Scale.h" #include "Tests/GTestWrapper/google_test.h" diff --git a/Tests/Unit/Base/SpinMatrixTest.cpp b/Tests/Unit/Base/SpinMatrixTest.cpp index 3ae0c66c041..ea0865df99f 100644 --- a/Tests/Unit/Base/SpinMatrixTest.cpp +++ b/Tests/Unit/Base/SpinMatrixTest.cpp @@ -1,4 +1,5 @@ #include "Base/Spin/SpinMatrix.h" + #include "Base/Spin/Spinor.h" #include "Tests/GTestWrapper/google_test.h" diff --git a/Tests/Unit/Base/StringUtilsTest.cpp b/Tests/Unit/Base/StringUtilsTest.cpp index b637ce9f243..cbedd1293be 100644 --- a/Tests/Unit/Base/StringUtilsTest.cpp +++ b/Tests/Unit/Base/StringUtilsTest.cpp @@ -1,4 +1,5 @@ #include "BATesting.h" + #include "Base/Util/StringUtil.h" #include "Tests/GTestWrapper/google_test.h" diff --git a/Tests/Unit/Device/BeamFootprintTest.cpp b/Tests/Unit/Device/BeamFootprintTest.cpp index 8ec622d781b..7ecae2c05fb 100644 --- a/Tests/Unit/Device/BeamFootprintTest.cpp +++ b/Tests/Unit/Device/BeamFootprintTest.cpp @@ -1,4 +1,5 @@ #include "Base/Const/Units.h" + #include "Device/Beam/Beam.h" #include "Device/Beam/FootprintGauss.h" #include "Device/Beam/FootprintSquare.h" diff --git a/Tests/Unit/Device/DatafieldTest.cpp b/Tests/Unit/Device/DatafieldTest.cpp index 973cc5300c7..9f568ae637d 100644 --- a/Tests/Unit/Device/DatafieldTest.cpp +++ b/Tests/Unit/Device/DatafieldTest.cpp @@ -1,4 +1,5 @@ #include "Device/Data/Datafield.h" + #include "Base/Axis/MakeScale.h" #include "Base/Axis/Scale.h" #include "Device/Data/DataUtil.h" diff --git a/Tests/Unit/Device/Detector2DTest.cpp b/Tests/Unit/Device/Detector2DTest.cpp index 7fa26764ec8..13d3c516575 100644 --- a/Tests/Unit/Device/Detector2DTest.cpp +++ b/Tests/Unit/Device/Detector2DTest.cpp @@ -1,4 +1,5 @@ #include "Device/Detector/Detector2D.h" + #include "Base/Axis/Frame.h" #include "Base/Axis/MakeScale.h" #include "Base/Axis/Scale.h" diff --git a/Tests/Unit/Device/PolygonTest.cpp b/Tests/Unit/Device/PolygonTest.cpp index 761d9c0eb33..30c0d1cbeac 100644 --- a/Tests/Unit/Device/PolygonTest.cpp +++ b/Tests/Unit/Device/PolygonTest.cpp @@ -1,4 +1,5 @@ #include "Device/Mask/Polygon.h" + #include "Base/Axis/Bin.h" #include "Tests/GTestWrapper/google_test.h" #include <memory> diff --git a/Tests/Unit/Device/RW2DTest.cpp b/Tests/Unit/Device/RW2DTest.cpp index f8e864b501a..ad631b7f08b 100644 --- a/Tests/Unit/Device/RW2DTest.cpp +++ b/Tests/Unit/Device/RW2DTest.cpp @@ -1,4 +1,5 @@ #include "Base/Axis/MakeScale.h" + #include "Base/Axis/Scale.h" #include "Device/Data/Datafield.h" #include "Device/IO/ReadWrite2DTable.h" diff --git a/Tests/Unit/Device/Read1DTest.cpp b/Tests/Unit/Device/Read1DTest.cpp index 9000a1bc572..c08000116ce 100644 --- a/Tests/Unit/Device/Read1DTest.cpp +++ b/Tests/Unit/Device/Read1DTest.cpp @@ -1,4 +1,5 @@ #include "BATesting.h" + #include "Base/Axis/Bin.h" #include "Base/Axis/Scale.h" #include "Device/Data/Datafield.h" diff --git a/Tests/Unit/Device/Read2DTest.cpp b/Tests/Unit/Device/Read2DTest.cpp index 737f6760fbf..1f8ab8a37a6 100644 --- a/Tests/Unit/Device/Read2DTest.cpp +++ b/Tests/Unit/Device/Read2DTest.cpp @@ -1,4 +1,5 @@ #include "BATesting.h" + #include "Device/Data/Datafield.h" #include "Device/IO/IOFactory.h" #include "Tests/GTestWrapper/google_test.h" diff --git a/Tests/Unit/Device/RegionOfInterestTest.cpp b/Tests/Unit/Device/RegionOfInterestTest.cpp index 75045879253..ae2a48d154a 100644 --- a/Tests/Unit/Device/RegionOfInterestTest.cpp +++ b/Tests/Unit/Device/RegionOfInterestTest.cpp @@ -1,4 +1,5 @@ #include "Base/Axis/Frame.h" + #include "Base/Axis/MakeScale.h" #include "Base/Axis/Scale.h" #include "Base/Const/Units.h" diff --git a/Tests/Unit/Device/Shape2DTest.cpp b/Tests/Unit/Device/Shape2DTest.cpp index 52460aaa0a9..5a79ea26011 100644 --- a/Tests/Unit/Device/Shape2DTest.cpp +++ b/Tests/Unit/Device/Shape2DTest.cpp @@ -1,4 +1,5 @@ #include "Base/Axis/Bin.h" + #include "Base/Const/Units.h" #include "Device/Mask/Ellipse.h" #include "Device/Mask/Line.h" diff --git a/Tests/Unit/Device/SpectrumTest.cpp b/Tests/Unit/Device/SpectrumTest.cpp index bd1507c47a8..fde987de7e6 100644 --- a/Tests/Unit/Device/SpectrumTest.cpp +++ b/Tests/Unit/Device/SpectrumTest.cpp @@ -1,4 +1,5 @@ #include "Device/Data/DataUtil.h" + #include "Tests/GTestWrapper/google_test.h" #include <iostream> #include <tspectrum.h> diff --git a/Tests/Unit/Fit/AttLimitsTest.cpp b/Tests/Unit/Fit/AttLimitsTest.cpp index cf60f0e1745..b634e3f7493 100644 --- a/Tests/Unit/Fit/AttLimitsTest.cpp +++ b/Tests/Unit/Fit/AttLimitsTest.cpp @@ -1,4 +1,5 @@ #include "Fit/Param/AttLimits.h" + #include "Tests/GTestWrapper/google_test.h" TEST(AttLimitsTest, InitialState) diff --git a/Tests/Unit/Fit/MinimizerOptionsTest.cpp b/Tests/Unit/Fit/MinimizerOptionsTest.cpp index 175d0499d23..972295e0c95 100644 --- a/Tests/Unit/Fit/MinimizerOptionsTest.cpp +++ b/Tests/Unit/Fit/MinimizerOptionsTest.cpp @@ -1,4 +1,5 @@ #include "Fit/Option/MinimizerOptions.h" + #include "Tests/GTestWrapper/google_test.h" #include <exception> diff --git a/Tests/Unit/Fit/MultiOptionTest.cpp b/Tests/Unit/Fit/MultiOptionTest.cpp index 35c670cb5e0..ef9b07d3284 100644 --- a/Tests/Unit/Fit/MultiOptionTest.cpp +++ b/Tests/Unit/Fit/MultiOptionTest.cpp @@ -1,4 +1,5 @@ #include "Fit/Option/MultiOption.h" + #include "Tests/GTestWrapper/google_test.h" #include <string> diff --git a/Tests/Unit/Fit/OptionContainerTest.cpp b/Tests/Unit/Fit/OptionContainerTest.cpp index 878a6ba8b5f..06f7b727ea1 100644 --- a/Tests/Unit/Fit/OptionContainerTest.cpp +++ b/Tests/Unit/Fit/OptionContainerTest.cpp @@ -1,4 +1,5 @@ #include "Fit/Option/OptionContainer.h" + #include "Tests/GTestWrapper/google_test.h" #include <exception> diff --git a/Tests/Unit/Fit/ParameterTest.cpp b/Tests/Unit/Fit/ParameterTest.cpp index 8073a5e5c75..33f244df3b7 100644 --- a/Tests/Unit/Fit/ParameterTest.cpp +++ b/Tests/Unit/Fit/ParameterTest.cpp @@ -1,4 +1,5 @@ #include "Fit/Param/Parameter.h" + #include "Tests/GTestWrapper/google_test.h" #include <string> diff --git a/Tests/Unit/Fit/ParametersTest.cpp b/Tests/Unit/Fit/ParametersTest.cpp index db180dbe5dc..8e05d8f7c45 100644 --- a/Tests/Unit/Fit/ParametersTest.cpp +++ b/Tests/Unit/Fit/ParametersTest.cpp @@ -1,4 +1,5 @@ #include "Fit/Param/Parameters.h" + #include "Tests/GTestWrapper/google_test.h" #include <string> diff --git a/Tests/Unit/Fit/RealLimitsTest.cpp b/Tests/Unit/Fit/RealLimitsTest.cpp index d91a408c237..6cb71426854 100644 --- a/Tests/Unit/Fit/RealLimitsTest.cpp +++ b/Tests/Unit/Fit/RealLimitsTest.cpp @@ -1,4 +1,5 @@ #include "Fit/Param/RealLimits.h" + #include "Tests/GTestWrapper/google_test.h" #include <limits> diff --git a/Tests/Unit/GUI/Comparators.cpp b/Tests/Unit/GUI/Comparators.cpp index 864f7d6fa63..9348d3605c3 100644 --- a/Tests/Unit/GUI/Comparators.cpp +++ b/Tests/Unit/GUI/Comparators.cpp @@ -1,4 +1,5 @@ #include "Tests/Unit/GUI/Comparators.h" + #include "GUI/Support/Data/ComboProperty.h" #include <QMetaType> diff --git a/Tests/Unit/GUI/TestAutosaveController.cpp b/Tests/Unit/GUI/TestAutosaveController.cpp index e02503e59b6..da6c0af5c71 100644 --- a/Tests/Unit/GUI/TestAutosaveController.cpp +++ b/Tests/Unit/GUI/TestAutosaveController.cpp @@ -1,4 +1,5 @@ #include "Base/Axis/Frame.h" + #include "Device/Data/Datafield.h" #include "GUI/Model/Data/Data2DItem.h" #include "GUI/Model/Device/DatafileItem.h" diff --git a/Tests/Unit/GUI/TestComboProperty.cpp b/Tests/Unit/GUI/TestComboProperty.cpp index b1e6616ffae..feab9abddd5 100644 --- a/Tests/Unit/GUI/TestComboProperty.cpp +++ b/Tests/Unit/GUI/TestComboProperty.cpp @@ -1,4 +1,5 @@ #include "GUI/Support/Data/ComboProperty.h" + #include "Tests/GTestWrapper/google_test.h" #include "Tests/Unit/GUI/Comparators.h" #include "Tests/Unit/GUI/Utils.h" diff --git a/Tests/Unit/GUI/TestDatafilesModel.cpp b/Tests/Unit/GUI/TestDatafilesModel.cpp index 17621612d06..4d7bb26702b 100644 --- a/Tests/Unit/GUI/TestDatafilesModel.cpp +++ b/Tests/Unit/GUI/TestDatafilesModel.cpp @@ -1,4 +1,5 @@ #include "Base/Axis/MakeScale.h" + #include "Device/Data/Datafield.h" #include "Device/IO/IOFactory.h" #include "GUI/Model/Data/DataItem.h" diff --git a/Tests/Unit/GUI/TestFitParameterModel.cpp b/Tests/Unit/GUI/TestFitParameterModel.cpp index 861dfaee031..351dccafff8 100644 --- a/Tests/Unit/GUI/TestFitParameterModel.cpp +++ b/Tests/Unit/GUI/TestFitParameterModel.cpp @@ -1,4 +1,5 @@ #include "GUI/Model/Job/FitParameterContainerItem.h" + #include "GUI/Model/Job/FitParameterItem.h" #include "GUI/Model/Job/FitParameterLinkItem.h" #include "GUI/Model/Job/FitSuiteItem.h" diff --git a/Tests/Unit/GUI/TestFormFactorItems.cpp b/Tests/Unit/GUI/TestFormFactorItems.cpp index 73bb1b595d0..f895f06df8a 100644 --- a/Tests/Unit/GUI/TestFormFactorItems.cpp +++ b/Tests/Unit/GUI/TestFormFactorItems.cpp @@ -1,4 +1,5 @@ #include "Base/Const/Units.h" + #include "Base/Math/Numeric.h" #include "GUI/Model/Sample/FormFactorItems.h" #include "Sample/HardParticle/Polyhedra.h" diff --git a/Tests/Unit/GUI/TestGUI.cpp b/Tests/Unit/GUI/TestGUI.cpp index ea4c58536d1..a718a6779b0 100644 --- a/Tests/Unit/GUI/TestGUI.cpp +++ b/Tests/Unit/GUI/TestGUI.cpp @@ -1,4 +1,5 @@ #include "Tests/GTestWrapper/google_test.h" + #include "Tests/Unit/GUI/Comparators.h" #include <QAbstractItemModel> #include <QCoreApplication> diff --git a/Tests/Unit/GUI/TestHelpers.cpp b/Tests/Unit/GUI/TestHelpers.cpp index 8cb267b3791..0d16351beef 100644 --- a/Tests/Unit/GUI/TestHelpers.cpp +++ b/Tests/Unit/GUI/TestHelpers.cpp @@ -1,4 +1,5 @@ #include "GUI/Support/Util/Path.h" + #include "Tests/GTestWrapper/google_test.h" TEST(TestHelpers, VersionString) diff --git a/Tests/Unit/GUI/TestInstrumentItems.cpp b/Tests/Unit/GUI/TestInstrumentItems.cpp index 5bbc0b4ec56..03443d71902 100644 --- a/Tests/Unit/GUI/TestInstrumentItems.cpp +++ b/Tests/Unit/GUI/TestInstrumentItems.cpp @@ -1,4 +1,5 @@ #include "GUI/Model/Device/InstrumentItems.h" + #include "GUI/Model/Project/ProjectDocument.h" #include "Tests/GTestWrapper/google_test.h" #include <QSignalSpy> diff --git a/Tests/Unit/GUI/TestJobModel.cpp b/Tests/Unit/GUI/TestJobModel.cpp index 0a52b311985..6eaa5820218 100644 --- a/Tests/Unit/GUI/TestJobModel.cpp +++ b/Tests/Unit/GUI/TestJobModel.cpp @@ -1,4 +1,5 @@ #include "Device/Data/Datafield.h" + #include "Device/IO/IOFactory.h" #include "GUI/Model/Data/DataItem.h" #include "GUI/Model/Device/DatafileItem.h" diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp index 07e9664dc34..979b7d21596 100644 --- a/Tests/Unit/GUI/TestLinkInstrument.cpp +++ b/Tests/Unit/GUI/TestLinkInstrument.cpp @@ -1,4 +1,5 @@ #include "Base/Axis/Frame.h" + #include "Device/Data/Datafield.h" #include "GUI/Model/Axis/BasicAxisItem.h" #include "GUI/Model/Data/DataItem.h" diff --git a/Tests/Unit/GUI/TestMaterialItems.cpp b/Tests/Unit/GUI/TestMaterialItems.cpp index 455393481e4..d0a6c693ed5 100644 --- a/Tests/Unit/GUI/TestMaterialItems.cpp +++ b/Tests/Unit/GUI/TestMaterialItems.cpp @@ -1,4 +1,5 @@ #include "GUI/Model/Sample/MaterialItem.h" + #include "GUI/Model/Sample/MaterialModel.h" #include "GUI/Support/XML/Backup.h" #include "Tests/GTestWrapper/google_test.h" diff --git a/Tests/Unit/GUI/TestMessageService.cpp b/Tests/Unit/GUI/TestMessageService.cpp index 699cbc53471..0f95f9bcaf3 100644 --- a/Tests/Unit/GUI/TestMessageService.cpp +++ b/Tests/Unit/GUI/TestMessageService.cpp @@ -1,4 +1,5 @@ #include "GUI/Support/Util/MessageService.h" + #include "Tests/GTestWrapper/google_test.h" #include <QObject> #include <QString> diff --git a/Tests/Unit/GUI/TestProfileItems.cpp b/Tests/Unit/GUI/TestProfileItems.cpp index 3172f753061..14ae838bad4 100644 --- a/Tests/Unit/GUI/TestProfileItems.cpp +++ b/Tests/Unit/GUI/TestProfileItems.cpp @@ -1,4 +1,5 @@ #include "GUI/Model/Sample/ProfileItems.h" + #include "Tests/GTestWrapper/google_test.h" TEST(TestProfileItems, Profile1DCauchy) diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp index 87a2e1e5952..d8e52c864b6 100644 --- a/Tests/Unit/GUI/TestProjectDocument.cpp +++ b/Tests/Unit/GUI/TestProjectDocument.cpp @@ -1,4 +1,5 @@ #include "Base/Axis/Frame.h" + #include "Device/Data/Datafield.h" #include "GUI/Model/Data/Data2DItem.h" #include "GUI/Model/Device/DatafileItem.h" diff --git a/Tests/Unit/GUI/TestScientificSpinBox.cpp b/Tests/Unit/GUI/TestScientificSpinBox.cpp index e306c725f9c..be1ad6165e0 100644 --- a/Tests/Unit/GUI/TestScientificSpinBox.cpp +++ b/Tests/Unit/GUI/TestScientificSpinBox.cpp @@ -1,4 +1,5 @@ #include "GUI/View/Numeric/ScientificSpinBox.h" + #include "Tests/GTestWrapper/google_test.h" #include <limits> diff --git a/Tests/Unit/GUI/TestString.cpp b/Tests/Unit/GUI/TestString.cpp index 3378b20573f..dd756775f40 100644 --- a/Tests/Unit/GUI/TestString.cpp +++ b/Tests/Unit/GUI/TestString.cpp @@ -1,4 +1,5 @@ #include "GUI/Support/Util/String.h" + #include "Tests/GTestWrapper/google_test.h" #include <QStringList> #include <QVector> diff --git a/Tests/Unit/GUI/TestUpdateTimer.cpp b/Tests/Unit/GUI/TestUpdateTimer.cpp index 4323d3a6ae5..935885603fc 100644 --- a/Tests/Unit/GUI/TestUpdateTimer.cpp +++ b/Tests/Unit/GUI/TestUpdateTimer.cpp @@ -1,4 +1,5 @@ #include "GUI/View/Tool/UpdateTimer.h" + #include "Tests/GTestWrapper/google_test.h" #include <QSignalSpy> diff --git a/Tests/Unit/Numeric/BesselTest.cpp b/Tests/Unit/Numeric/BesselTest.cpp index 328b80ca517..38eec8d37f4 100644 --- a/Tests/Unit/Numeric/BesselTest.cpp +++ b/Tests/Unit/Numeric/BesselTest.cpp @@ -1,4 +1,5 @@ #include "Base/Math/Bessel.h" + #include "Tests/GTestWrapper/google_test.h" // Test complex Bessel function J1 diff --git a/Tests/Unit/Numeric/BisectFF.cpp b/Tests/Unit/Numeric/BisectFF.cpp index 658a35b4d54..7397c88c1b4 100644 --- a/Tests/Unit/Numeric/BisectFF.cpp +++ b/Tests/Unit/Numeric/BisectFF.cpp @@ -3,9 +3,11 @@ #include <numbers> using std::numbers::pi; + #include "Sample/HardParticle/HardParticles.h" <ff / Face.h> // for diagnostic + #include "Tests/GTestWrapper/google_test.h" #include <cassert> #include <complex> diff --git a/Tests/Unit/Numeric/FormFactorOtherTest.cpp b/Tests/Unit/Numeric/FormFactorOtherTest.cpp index 01496da7848..e87f73a5ce3 100644 --- a/Tests/Unit/Numeric/FormFactorOtherTest.cpp +++ b/Tests/Unit/Numeric/FormFactorOtherTest.cpp @@ -1,4 +1,5 @@ #include "Sample/HardParticle/HardParticles.h" + #include "Sample/Scattering/Rotations.h" #include "Tests/Unit/Numeric/MultiQTest.h" #include <numbers> diff --git a/Tests/Unit/Numeric/FormFactorSpecializationTest.cpp b/Tests/Unit/Numeric/FormFactorSpecializationTest.cpp index e1f0142a240..e6745eb9b2e 100644 --- a/Tests/Unit/Numeric/FormFactorSpecializationTest.cpp +++ b/Tests/Unit/Numeric/FormFactorSpecializationTest.cpp @@ -1,4 +1,5 @@ #include "Sample/HardParticle/HardParticles.h" + #include "Tests/GTestWrapper/google_test.h" #include "Tests/Unit/Numeric/MultiQTest.h" #include <ff/Face.h> // for diagnostic diff --git a/Tests/Unit/Numeric/FormFactorSymmetryTest.cpp b/Tests/Unit/Numeric/FormFactorSymmetryTest.cpp index 7ee317ea113..2f863876ce5 100644 --- a/Tests/Unit/Numeric/FormFactorSymmetryTest.cpp +++ b/Tests/Unit/Numeric/FormFactorSymmetryTest.cpp @@ -1,6 +1,7 @@ #include <numbers> using std::numbers::pi; + #include "Sample/HardParticle/HardParticles.h" #include "Tests/GTestWrapper/google_test.h" #include "Tests/Unit/Numeric/MultiQTest.h" diff --git a/Tests/Unit/Numeric/FourierTransformTest.cpp b/Tests/Unit/Numeric/FourierTransformTest.cpp index f09306bda8d..bff5d489cf0 100644 --- a/Tests/Unit/Numeric/FourierTransformTest.cpp +++ b/Tests/Unit/Numeric/FourierTransformTest.cpp @@ -1,4 +1,5 @@ #include "Base/Math/FourierTransform.h" + #include "Device/Data/Datafield.h" #include "Tests/GTestWrapper/google_test.h" diff --git a/Tests/Unit/Numeric/MultiQTest.cpp b/Tests/Unit/Numeric/MultiQTest.cpp index f4067562bac..bc4687f3ca3 100644 --- a/Tests/Unit/Numeric/MultiQTest.cpp +++ b/Tests/Unit/Numeric/MultiQTest.cpp @@ -1,4 +1,5 @@ #include "Tests/Unit/Numeric/MultiQTest.h" + #include "Tests/GTestWrapper/google_test.h" using ::testing::internal::ParamGenerator; diff --git a/Tests/Unit/Numeric/SpecialFunctionsTest.cpp b/Tests/Unit/Numeric/SpecialFunctionsTest.cpp index 59090e33e19..d1785e657ef 100644 --- a/Tests/Unit/Numeric/SpecialFunctionsTest.cpp +++ b/Tests/Unit/Numeric/SpecialFunctionsTest.cpp @@ -1,6 +1,7 @@ #include <numbers> using std::numbers::pi; + #include "Base/Math/Functions.h" #include "Tests/GTestWrapper/google_test.h" diff --git a/Tests/Unit/Param/ParameterDistributionTest.cpp b/Tests/Unit/Param/ParameterDistributionTest.cpp index f1b7acfcfc9..a7e550e0cca 100644 --- a/Tests/Unit/Param/ParameterDistributionTest.cpp +++ b/Tests/Unit/Param/ParameterDistributionTest.cpp @@ -1,4 +1,5 @@ #include "Param/Distrib/ParameterDistribution.h" + #include "Param/Distrib/Distributions.h" #include "Tests/GTestWrapper/google_test.h" #include <cmath> diff --git a/Tests/Unit/Resample/KzComputationTest.cpp b/Tests/Unit/Resample/KzComputationTest.cpp index 6a3267c6240..491d16bbe7a 100644 --- a/Tests/Unit/Resample/KzComputationTest.cpp +++ b/Tests/Unit/Resample/KzComputationTest.cpp @@ -1,4 +1,5 @@ #include "Resample/Slice/KzComputation.h" + #include "Base/Const/Units.h" #include "Base/Vector/GisasDirection.h" #include "Resample/Processed/ReSample.h" diff --git a/Tests/Unit/Resample/MaterialTest.cpp b/Tests/Unit/Resample/MaterialTest.cpp index 7dab6a92023..1a8179e1bd1 100644 --- a/Tests/Unit/Resample/MaterialTest.cpp +++ b/Tests/Unit/Resample/MaterialTest.cpp @@ -1,4 +1,5 @@ #include "Base/Const/Units.h" + #include "Base/Vector/RotMatrix.h" #include "Base/Vector/WavevectorInfo.h" #include "Sample/Material/MaterialFactoryFuncs.h" diff --git a/Tests/Unit/Resample/MultilayerAveragingTest.cpp b/Tests/Unit/Resample/MultilayerAveragingTest.cpp index aa760c3fb41..e0e753cb9cf 100644 --- a/Tests/Unit/Resample/MultilayerAveragingTest.cpp +++ b/Tests/Unit/Resample/MultilayerAveragingTest.cpp @@ -1,4 +1,5 @@ #include "Resample/Processed/ReSample.h" + #include "Sample/Aggregate/Interference2DLattice.h" #include "Sample/Aggregate/ParticleLayout.h" #include "Sample/HardParticle/Cylinder.h" diff --git a/Tests/Unit/Resample/RTTest.cpp b/Tests/Unit/Resample/RTTest.cpp index 60fcee5de6d..ef086de2ee6 100644 --- a/Tests/Unit/Resample/RTTest.cpp +++ b/Tests/Unit/Resample/RTTest.cpp @@ -1,4 +1,5 @@ #include "Resample/Flux/ScalarFlux.h" + #include "Resample/Processed/ReSample.h" #include "Resample/Specular/ComputeFluxScalar.h" #include "Sample/Aggregate/ParticleLayout.h" diff --git a/Tests/Unit/Resample/ZLimitsTest.cpp b/Tests/Unit/Resample/ZLimitsTest.cpp index be63ffa1ae2..754704e1810 100644 --- a/Tests/Unit/Resample/ZLimitsTest.cpp +++ b/Tests/Unit/Resample/ZLimitsTest.cpp @@ -1,4 +1,5 @@ #include "Resample/Slice/ZLimits.h" + #include "Tests/GTestWrapper/google_test.h" #include <stdexcept> diff --git a/Tests/Unit/Sample/CoreAndShellTest.cpp b/Tests/Unit/Sample/CoreAndShellTest.cpp index 970f50eb48d..025680ffc9b 100644 --- a/Tests/Unit/Sample/CoreAndShellTest.cpp +++ b/Tests/Unit/Sample/CoreAndShellTest.cpp @@ -1,4 +1,5 @@ #include "Sample/Particle/CoreAndShell.h" + #include "Base/Const/Units.h" #include "Sample/HardParticle/HardParticles.h" #include "Sample/Material/MaterialFactoryFuncs.h" diff --git a/Tests/Unit/Sample/FormFactorBasicTest.cpp b/Tests/Unit/Sample/FormFactorBasicTest.cpp index fb3bc730fd9..fe051a4a7a0 100644 --- a/Tests/Unit/Sample/FormFactorBasicTest.cpp +++ b/Tests/Unit/Sample/FormFactorBasicTest.cpp @@ -1,4 +1,5 @@ #include "Base/Const/Units.h" + #include "Base/Types/Span.h" #include "Sample/HardParticle/HardParticles.h" #include "Sample/Scattering/Rotations.h" diff --git a/Tests/Unit/Sample/Lattice2DTest.cpp b/Tests/Unit/Sample/Lattice2DTest.cpp index 2c70b46aaf7..3260d1b6ddb 100644 --- a/Tests/Unit/Sample/Lattice2DTest.cpp +++ b/Tests/Unit/Sample/Lattice2DTest.cpp @@ -1,4 +1,5 @@ #include "Sample/Lattice/Lattice2D.h" + #include "Tests/GTestWrapper/google_test.h" TEST(Lattice2DTest, basicLatticeClone) diff --git a/Tests/Unit/Sample/LatticeTest.cpp b/Tests/Unit/Sample/LatticeTest.cpp index ce559b63a14..b88768b7fb6 100644 --- a/Tests/Unit/Sample/LatticeTest.cpp +++ b/Tests/Unit/Sample/LatticeTest.cpp @@ -1,6 +1,7 @@ #include <numbers> using std::numbers::pi; + #include "Base/Vector/RotMatrix.h" #include "Sample/Lattice/BakeLattice.h" #include "Sample/Lattice/Lattice3D.h" diff --git a/Tests/Unit/Sample/LayerRoughnessTest.cpp b/Tests/Unit/Sample/LayerRoughnessTest.cpp index b629e44a818..cc30c68d03e 100644 --- a/Tests/Unit/Sample/LayerRoughnessTest.cpp +++ b/Tests/Unit/Sample/LayerRoughnessTest.cpp @@ -1,4 +1,5 @@ #include "Sample/Interface/LayerRoughness.h" + #include "Tests/GTestWrapper/google_test.h" // test clone LayerRoughness diff --git a/Tests/Unit/Sample/LayerTest.cpp b/Tests/Unit/Sample/LayerTest.cpp index c8ab1b52a62..5536ce66576 100644 --- a/Tests/Unit/Sample/LayerTest.cpp +++ b/Tests/Unit/Sample/LayerTest.cpp @@ -1,4 +1,5 @@ #include "Sample/Multilayer/Layer.h" + #include "Base/Const/Units.h" #include "Sample/Aggregate/ParticleLayout.h" #include "Sample/Material/MaterialFactoryFuncs.h" diff --git a/Tests/Unit/Sample/MultiLayerTest.cpp b/Tests/Unit/Sample/MultiLayerTest.cpp index 3b4e85bacf7..7f7539973ed 100644 --- a/Tests/Unit/Sample/MultiLayerTest.cpp +++ b/Tests/Unit/Sample/MultiLayerTest.cpp @@ -1,4 +1,5 @@ #include "Sample/Multilayer/MultiLayer.h" + #include "Base/Const/Units.h" #include "Sample/Aggregate/ParticleLayout.h" #include "Sample/Interface/LayerInterface.h" diff --git a/Tests/Unit/Sample/ParticleCompositionTest.cpp b/Tests/Unit/Sample/ParticleCompositionTest.cpp index 948a653aa1d..82b42018795 100644 --- a/Tests/Unit/Sample/ParticleCompositionTest.cpp +++ b/Tests/Unit/Sample/ParticleCompositionTest.cpp @@ -1,4 +1,5 @@ #include "Sample/HardParticle/Sphere.h" + #include "Sample/Material/MaterialFactoryFuncs.h" #include "Sample/Particle/Compound.h" #include "Sample/Particle/Particle.h" diff --git a/Tests/Unit/Sample/ProfilesTest.cpp b/Tests/Unit/Sample/ProfilesTest.cpp index d36e9ad9c55..7dc913f2fa1 100644 --- a/Tests/Unit/Sample/ProfilesTest.cpp +++ b/Tests/Unit/Sample/ProfilesTest.cpp @@ -1,4 +1,5 @@ #include "Sample/Correlations/Profiles1D.h" + #include "Sample/Correlations/Profiles2D.h" #include "Tests/GTestWrapper/google_test.h" #include <memory> diff --git a/Tests/Unit/Sample/RotationTest.cpp b/Tests/Unit/Sample/RotationTest.cpp index 27f8eb68aea..e855fff9029 100644 --- a/Tests/Unit/Sample/RotationTest.cpp +++ b/Tests/Unit/Sample/RotationTest.cpp @@ -1,4 +1,5 @@ #include "Base/Vector/RotMatrix.h" + #include "Sample/Scattering/Rotations.h" #include "Tests/GTestWrapper/google_test.h" #include <memory> diff --git a/Tests/Unit/Sim/ChiSquaredModuleTest.cpp b/Tests/Unit/Sim/ChiSquaredModuleTest.cpp index d458693df0c..3935ac2bb3d 100644 --- a/Tests/Unit/Sim/ChiSquaredModuleTest.cpp +++ b/Tests/Unit/Sim/ChiSquaredModuleTest.cpp @@ -1,4 +1,5 @@ #include "Sim/Residual/ChiSquaredModule.h" + #include "Device/Data/Datafield.h" #include "Sim/Residual/VarianceFunctions.h" #include "Tests/GTestWrapper/google_test.h" diff --git a/Tests/Unit/Sim/FitObjectiveTest.cpp b/Tests/Unit/Sim/FitObjectiveTest.cpp index 22ef57a03db..7f366072d26 100644 --- a/Tests/Unit/Sim/FitObjectiveTest.cpp +++ b/Tests/Unit/Sim/FitObjectiveTest.cpp @@ -1,4 +1,5 @@ #include "Sim/Fitting/FitObjective.h" + #include "Tests/GTestWrapper/google_test.h" #include "Tests/Unit/Sim/FittingTestHelper.h" diff --git a/Tests/Unit/Sim/FitObserverTest.cpp b/Tests/Unit/Sim/FitObserverTest.cpp index 429443d33b8..c360cf2a601 100644 --- a/Tests/Unit/Sim/FitObserverTest.cpp +++ b/Tests/Unit/Sim/FitObserverTest.cpp @@ -1,4 +1,5 @@ #include "Sim/Fitting/FitObserver.h" + #include "Tests/GTestWrapper/google_test.h" class FitObserverTest : public ::testing::Test { diff --git a/Tests/Unit/Sim/ObjectiveMetricTest.cpp b/Tests/Unit/Sim/ObjectiveMetricTest.cpp index 4122b503982..c7bfc1062fd 100644 --- a/Tests/Unit/Sim/ObjectiveMetricTest.cpp +++ b/Tests/Unit/Sim/ObjectiveMetricTest.cpp @@ -1,4 +1,5 @@ #include "Sim/Fitting/ObjectiveMetric.h" + #include "Sim/Fitting/ObjectiveMetricUtil.h" #include "Tests/GTestWrapper/google_test.h" #include <cmath> diff --git a/Tests/Unit/Sim/ParticleLayoutTest.cpp b/Tests/Unit/Sim/ParticleLayoutTest.cpp index 4bb04eb9862..29073540712 100644 --- a/Tests/Unit/Sim/ParticleLayoutTest.cpp +++ b/Tests/Unit/Sim/ParticleLayoutTest.cpp @@ -1,4 +1,5 @@ #include "Sample/Aggregate/ParticleLayout.h" + #include "Base/Const/Units.h" #include "Param/Node/NodeUtil.h" #include "Sample/Aggregate/Interference1DLattice.h" diff --git a/Tests/Unit/Sim/SimDataPairTest.cpp b/Tests/Unit/Sim/SimDataPairTest.cpp index 0c005bf9efb..7a58c01f839 100644 --- a/Tests/Unit/Sim/SimDataPairTest.cpp +++ b/Tests/Unit/Sim/SimDataPairTest.cpp @@ -1,4 +1,5 @@ #include "Sim/Fitting/SimDataPair.h" + #include "Device/Data/Datafield.h" #include "Tests/GTestWrapper/google_test.h" #include "Tests/Unit/Sim/FittingTestHelper.h" diff --git a/Tests/Unit/Sim/SpecularScanTest.cpp b/Tests/Unit/Sim/SpecularScanTest.cpp index 9a57edd4c84..34efc88f282 100644 --- a/Tests/Unit/Sim/SpecularScanTest.cpp +++ b/Tests/Unit/Sim/SpecularScanTest.cpp @@ -1,4 +1,5 @@ #include "Base/Axis/MakeScale.h" + #include "Base/Axis/Scale.h" #include "Param/Distrib/Distributions.h" #include "Param/Distrib/ParameterSample.h" diff --git a/Wrap/PythonPackage/src/bornagain_c_ext_dummy.c b/Wrap/PythonPackage/src/bornagain_c_ext_dummy.c index 9490848b523..506d883d4e1 100644 --- a/Wrap/PythonPackage/src/bornagain_c_ext_dummy.c +++ b/Wrap/PythonPackage/src/bornagain_c_ext_dummy.c @@ -1,5 +1,6 @@ // dummy C extension to set the correct wheel tag according to PEP 425 //*** Please DO NOT change the contents ***// + #include <Python.h> PyMODINIT_FUNC PyInit___bornagain_dummy_c_ext(void) diff --git a/cmake/tests/test_libcerf.cpp b/cmake/tests/test_libcerf.cpp index 0578b4c1bfb..e806ffc3a1e 100644 --- a/cmake/tests/test_libcerf.cpp +++ b/cmake/tests/test_libcerf.cpp @@ -1,4 +1,5 @@ #include "3rdparty/Core/cerfcpp.h" + #include <complex> int main() -- GitLab