diff --git a/App/main.cpp b/App/main.cpp
index 5881ab0e7f9e356d9b456871f8022099be16fd25..80931f1a3570c9062aff2cbd00812d24e339ad8d 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -16,7 +16,6 @@
#include "App/MessageHandler.h"
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Model/State/SessionData.h"
-#include "GUI/Util/OSInfo.h"
#include "GUI/Util/Path.h"
#include "GUI/View/Global/Globals.h"
#include "GUI/View/Loaders/DataLoaderUtil.h"
@@ -47,8 +46,9 @@ int main(int argc, char* argv[])
QApplication::setApplicationName("BornAgain");
QApplication::setApplicationVersion(GUI::Util::Path::getBornAgainVersionString());
QApplication::setOrganizationName("BornAgain");
- if (!GUI::Util::OS::HostOsInfo::isMacHost())
- QApplication::setWindowIcon(QIcon(":/images/BornAgain.ico"));
+#ifndef Q_OS_MAC
+ QApplication::setWindowIcon(QIcon(":/images/BornAgain.ico"));
+#endif
ApplicationSettings applicationSettings;
SessionData GSession;
diff --git a/GUI/Util/OSInfo.h b/GUI/Util/OSInfo.h
deleted file mode 100644
index 57b7d43547deb909ec1ae619ef8821c5abba21c1..0000000000000000000000000000000000000000
--- a/GUI/Util/OSInfo.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// ************************************************************************************************
-//
-// BornAgain: simulate and fit reflection and scattering
-//
-//! @file GUI/Util/OSInfo.h
-//! @brief Defines namespace GUI::Util::OS
-//!
-//! @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_OSINFO_H
-#define BORNAGAIN_GUI_UTIL_OSINFO_H
-
-#include <QString>
-
-namespace GUI::Util::OS {
-
-#define QTC_WIN_EXE_SUFFIX ".exe"
-
-enum EOsType { WINDOWS_OS, LINUX_OS, MAC_OS, OTHER_UNIX_OS, OTHER_OS };
-
-class OsSpecificAspects {
-public:
- OsSpecificAspects(EOsType osType)
- : m_osType(osType)
- {
- }
-
- QString withExecutableSuffix(const QString& executable) const
- {
- QString finalName = executable;
- if (m_osType == WINDOWS_OS)
- finalName += QLatin1String(QTC_WIN_EXE_SUFFIX);
- return finalName;
- }
-
- Qt::CaseSensitivity fileNameCaseSensitivity() const
- {
- return m_osType == WINDOWS_OS ? Qt::CaseInsensitive : Qt::CaseSensitive;
- }
-
- QChar pathListSeparator() const { return QLatin1Char(m_osType == WINDOWS_OS ? ';' : ':'); }
-
- Qt::KeyboardModifier controlModifier() const
- {
- return m_osType == MAC_OS ? Qt::MetaModifier : Qt::ControlModifier;
- }
-
-private:
- const EOsType m_osType;
-};
-
-class HostOsInfo {
-public:
- static inline EOsType hostOs();
-
- enum HostArchitecture {
- HostArchitectureX86,
- HostArchitectureAMD64,
- HostArchitectureItanium,
- HostArchitectureArm,
- HostArchitectureUnknown
- };
- static HostArchitecture hostArchitecture();
-
- static bool isWindowsHost() { return hostOs() == WINDOWS_OS; }
- static bool isLinuxHost() { return hostOs() == LINUX_OS; }
- static bool isMacHost() { return hostOs() == MAC_OS; }
- static inline bool isAnyUnixHost();
-
- static QString withExecutableSuffix(const QString& executable)
- {
- return hostOsAspects().withExecutableSuffix(executable);
- }
-
- static Qt::CaseSensitivity fileNameCaseSensitivity()
- {
- return hostOsAspects().fileNameCaseSensitivity();
- }
-
- static QChar pathListSeparator() { return hostOsAspects().pathListSeparator(); }
-
- static Qt::KeyboardModifier controlModifier() { return hostOsAspects().controlModifier(); }
-
-private:
- static OsSpecificAspects hostOsAspects() { return OsSpecificAspects(hostOs()); }
-};
-
-EOsType HostOsInfo::hostOs()
-{
-#if defined(Q_OS_WIN)
- return WINDOWS_OS;
-#elif defined(Q_OS_LINUX)
- return LINUX_OS;
-#elif defined(Q_OS_MAC)
- return MAC_OS;
-#elif defined(Q_OS_UNIX)
- return OTHER_UNIX_OS;
-#else
- return OTHER_OS;
-#endif
-}
-
-bool HostOsInfo::isAnyUnixHost()
-{
-#ifdef Q_OS_UNIX
- return true;
-#else
- return false;
-#endif
-}
-
-} // namespace GUI::Util::OS
-
-#endif // BORNAGAIN_GUI_UTIL_OSINFO_H
diff --git a/GUI/Util/Path.cpp b/GUI/Util/Path.cpp
index bfc5de91c6259fa41ec50a64668e26151518fab2..99693c0a3f0515a546c45f20939ccaade25cc4a3 100644
--- a/GUI/Util/Path.cpp
+++ b/GUI/Util/Path.cpp
@@ -14,7 +14,6 @@
#include "GUI/Util/Path.h"
#include "BAVersion.h"
-#include "GUI/Util/OSInfo.h"
#include <QDateTime>
#include <QDir>
#include <QFileInfo>
@@ -45,8 +44,9 @@ const QMap<QString, QString> invalidCharacterMap = initializeCharacterMap();
QString GUI::Util::Path::withTildeHomePath(const QString& path)
{
- if (GUI::Util::OS::HostOsInfo::isWindowsHost())
- return path;
+#ifdef Q_OS_WIN
+ return path;
+#endif
static const QString homePath = QDir::homePath();
diff --git a/GUI/Util/String.cpp b/GUI/Util/String.cpp
index b14500e1b462f6ebb7948bbe4a785f60ca5240e1..21c2c6ff927a2947954709439cbc7256cb0fbb95 100644
--- a/GUI/Util/String.cpp
+++ b/GUI/Util/String.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Util/String.h"
-#include "GUI/Util/OSInfo.h"
#include <QDir>
QStringList GUI::Util::String::fromStdStrings(const std::vector<std::string>& container)
diff --git a/GUI/View/Instrument/Detail/detailsbutton.cpp b/GUI/View/Instrument/Detail/detailsbutton.cpp
index e332d998e9e09f0923f05fbf13b432764a74411f..4249af26943adaeeac4c704ce80a8f1e51b9b7bc 100644
--- a/GUI/View/Instrument/Detail/detailsbutton.cpp
+++ b/GUI/View/Instrument/Detail/detailsbutton.cpp
@@ -24,8 +24,6 @@
****************************************************************************/
#include "GUI/View/Instrument/Detail/detailsbutton.h"
-#include "GUI/Util/OSInfo.h"
-
#include <QGraphicsOpacityEffect>
#include <QPaintEvent>
#include <QPainter>
@@ -92,9 +90,12 @@ QSize DetailsButton::sizeHint() const
#else
const int w = fontMetrics().width(text()) + 32;
#endif
- if (GUI::Util::OS::HostOsInfo::isMacHost())
- return QSize(w, 34);
+
+#ifdef Q_OS_MAC
+ return QSize(w, 34);
+#else
return QSize(w, 22);
+#endif
}
bool DetailsButton::event(QEvent* e)
@@ -125,7 +126,8 @@ void DetailsButton::paintEvent(QPaintEvent* e)
QPainter p(this);
// draw hover animation
- if (!GUI::Util::OS::HostOsInfo::isMacHost() && !isDown() && m_fader > 0) {
+#ifndef Q_OS_MAC
+ if (!isDown() && m_fader > 0) {
QColor c = DetailsButtonBackgroundColorHover;
c.setAlpha(int(m_fader * c.alpha()));
@@ -134,6 +136,7 @@ void DetailsButton::paintEvent(QPaintEvent* e)
r.adjust(1, 1, -2, -2);
p.fillRect(r, c);
}
+#endif
if (isChecked()) {
if (m_checkedPixmap.isNull()
diff --git a/GUI/View/Instrument/Detail/detailswidget.cpp b/GUI/View/Instrument/Detail/detailswidget.cpp
index 6eb087426da7ba53adc1d7da1d0012b4529ab982..80f16d0ca1add4af4c02ccf5dd21da01849e6005 100644
--- a/GUI/View/Instrument/Detail/detailswidget.cpp
+++ b/GUI/View/Instrument/Detail/detailswidget.cpp
@@ -24,7 +24,6 @@
****************************************************************************/
#include "GUI/View/Instrument/Detail/detailswidget.h"
-#include "GUI/Util/OSInfo.h"
#include "GUI/View/Instrument/Detail/detailsbutton.h"
#include <QApplication>
@@ -203,10 +202,11 @@ void DetailsWidgetPrivate::changeHoverState(bool hovered)
{
if (!m_toolWidget)
return;
- if (GUI::Util::OS::HostOsInfo::isMacHost())
- m_toolWidget->setOpacity(hovered ? 1.0 : 0);
- else
- m_toolWidget->fadeTo(hovered ? 1.0 : 0);
+#ifdef Q_OS_MAC
+ m_toolWidget->setOpacity(hovered ? 1.0 : 0);
+#else
+ m_toolWidget->fadeTo(hovered ? 1.0 : 0);
+#endif
m_hovered = hovered;
}
@@ -397,8 +397,9 @@ void DetailsWidget::setToolWidget(FadingPanel* widget)
d->m_toolWidget->adjustSize();
d->m_grid->addWidget(d->m_toolWidget, 0, 1, 1, 1, Qt::AlignRight);
- if (GUI::Util::OS::HostOsInfo::isMacHost())
- d->m_toolWidget->setOpacity(1.0);
+#ifdef Q_OS_MAC
+ d->m_toolWidget->setOpacity(1.0);
+#endif
d->changeHoverState(d->m_hovered);
}
diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp
index c1fe2fce0129d9995a01a3491fc530bc98ddf12a..6d05feb99a3976536b808c2e0dff526dd8134760 100644
--- a/GUI/View/Main/ActionManager.cpp
+++ b/GUI/View/Main/ActionManager.cpp
@@ -17,7 +17,6 @@
#include "Base/Util/SysUtils.h"
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Model/State/SessionData.h"
-#include "GUI/Util/OSInfo.h"
#include "GUI/Util/Path.h"
#include "GUI/View/Job/JobView.h"
#include "GUI/View/Main/AboutDialog.h"
@@ -130,8 +129,9 @@ void ActionManager::createMenus()
{
m_menuBar = new QMenuBar(nullptr); // No parent (System menu bar on Mac OS X)
- if (!GUI::Util::OS::HostOsInfo::isMacHost())
- m_mainWindow->setMenuBar(m_menuBar);
+#ifndef Q_OS_MAC
+ m_mainWindow->setMenuBar(m_menuBar);
+#endif
// File Menu
m_fileMenu = m_menuBar->addMenu("&File");
diff --git a/GUI/View/Main/MainWindow.cpp b/GUI/View/Main/MainWindow.cpp
index d36a3b0c5d017d3109cede7ae071ace9309f6c4d..5b78a0fb43d6976dc3e1e518898915d23f37bf2b 100644
--- a/GUI/View/Main/MainWindow.cpp
+++ b/GUI/View/Main/MainWindow.cpp
@@ -16,7 +16,6 @@
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Model/Project/JobModel.h"
#include "GUI/Model/State/SessionData.h"
-#include "GUI/Util/OSInfo.h"
#include "GUI/Util/Path.h"
#include "GUI/View/Import/ImportDataView.h"
#include "GUI/View/Instrument/InstrumentView.h"
diff --git a/GUI/View/PropertyEditor/GroupInfoBox.cpp b/GUI/View/PropertyEditor/GroupInfoBox.cpp
index 703077113652e0f1a77c1b1a7a4340c561fa4efa..4713b4df7d29a72462d2a567371adfb247e89f77 100644
--- a/GUI/View/PropertyEditor/GroupInfoBox.cpp
+++ b/GUI/View/PropertyEditor/GroupInfoBox.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/View/PropertyEditor/GroupInfoBox.h"
-#include "GUI/Util/OSInfo.h"
#include <QApplication>
#include <QMouseEvent>
#include <QPainter>
@@ -92,9 +91,11 @@ void GroupInfoBox::paintEvent(QPaintEvent*)
m_yImage = 0;
// draw groupbox
- int shift(1);
- if (GUI::Util::OS::HostOsInfo::isLinuxHost())
- shift = 3;
+#ifdef Q_OS_LINUX
+ const int shift = 3;
+#else
+ const int shift = 1;
+#endif
paint.drawItemPixmap(option.rect.adjusted(0, shift, 0, 0), Qt::AlignTop | Qt::AlignRight,
QPixmap(":/images/magnifier.png"));
diff --git a/GUI/View/SampleDesigner/SampleListView.cpp b/GUI/View/SampleDesigner/SampleListView.cpp
index 1fd2fcba33f6ea06987abd77383b235c59bc07fe..f74f0ce24ab3917c78344c69e0ebce7870500900 100644
--- a/GUI/View/SampleDesigner/SampleListView.cpp
+++ b/GUI/View/SampleDesigner/SampleListView.cpp
@@ -17,7 +17,6 @@
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Util/OSInfo.h"
#include "GUI/View/Common/ItemViewOverlayButtons.h"
#include "GUI/View/FromDomain/GUIExamplesFactory.h"
#include "GUI/View/SampleDesigner/SampleListModel.h"
@@ -102,9 +101,10 @@ SampleListView::SampleListView(QWidget* parent, ProjectDocument* document)
"Import sample from Python script.\n The script should contain a function "
"returning a valid multi-layer.");
- if (GUI::Util::OS::HostOsInfo::isMacHost())
- if (BaseUtils::System::getenv("PYTHONHOME").empty())
- m_importSampleAction->setEnabled(false);
+#ifdef Q_OS_MAC
+ if (BaseUtils::System::getenv("PYTHONHOME").empty())
+ m_importSampleAction->setEnabled(false);
+#endif
#ifdef BORNAGAIN_PYTHON
connect(m_importSampleAction, &QAction::triggered, this,
diff --git a/GUI/View/Tool/StyleUtils.cpp b/GUI/View/Tool/StyleUtils.cpp
index 5c5c980c3e72c92df136b4298b44239a254b721e..9d9bd46bf3a3591ef4a34dd3f4e25d5f41aeeb47 100644
--- a/GUI/View/Tool/StyleUtils.cpp
+++ b/GUI/View/Tool/StyleUtils.cpp
@@ -14,7 +14,6 @@
#include "GUI/View/Tool/StyleUtils.h"
#include "Base/Util/Assert.h"
-#include "GUI/Util/OSInfo.h"
#include "GUI/View/Tool/DesignerHelper.h"
#include <QApplication>
#include <QBoxLayout>
@@ -98,13 +97,17 @@ QFont GUI::Util::Style::labelFont(bool bold)
return result;
}
-void GUI::Util::Style::setResizable(QDialog* dialog)
+void GUI::Util::Style::setResizable(QDialog*
+#ifdef Q_OS_MAC
+ dialog
+#endif
+)
{
- if (GUI::Util::OS::HostOsInfo::isMacHost()) {
- dialog->setWindowFlags(Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint
- | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint
- | Qt::Window);
- }
+#ifdef Q_OS_MAC
+ dialog->setWindowFlags(Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint
+ | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint
+ | Qt::Window);
+#endif
}
QSize GUI::Util::Style::SizeOfLetterM(const QWidget* widget)
diff --git a/Sample/ComponentBuilder/IRegistry.h b/Sample/ComponentBuilder/IRegistry.h
index 49b37f076047752de6343a4699bc04569874facd..f05afb97354a43e4677dfc1deb3268b075d01df2 100644
--- a/Sample/ComponentBuilder/IRegistry.h
+++ b/Sample/ComponentBuilder/IRegistry.h
@@ -34,7 +34,7 @@ public:
const ValueType* getItem(const std::string& key) const
{
auto it = m_data.find(key);
- ASSERT (it != m_data.end());
+ ASSERT(it != m_data.end());
return it->second.get();
}
@@ -51,7 +51,7 @@ public:
protected:
void add(const std::string& key, ValueType* item)
{
- ASSERT (m_data.find(key) == m_data.end());
+ ASSERT(m_data.find(key) == m_data.end());
m_data[key] = std::unique_ptr<ValueType>(item);
}
diff --git a/Sample/Interface/LayerInterface.cpp b/Sample/Interface/LayerInterface.cpp
index 75d4b2fc7c55f5357e4291f9f8e4fa85d1a40fcc..2045ee135cba5e098f81f715e7fa31a29cfaebc8 100644
--- a/Sample/Interface/LayerInterface.cpp
+++ b/Sample/Interface/LayerInterface.cpp
@@ -60,7 +60,7 @@ std::vector<const INode*> LayerInterface::nodeChildren() const
void LayerInterface::setLayersTopBottom(const Layer* top_layer, const Layer* bottom_layer)
{
- ASSERT (top_layer && bottom_layer);
+ ASSERT(top_layer && bottom_layer);
m_topLayer = top_layer;
m_bottomLayer = bottom_layer;
}
diff --git a/Sample/Particle/IBornFF.cpp b/Sample/Particle/IBornFF.cpp
index 6c2fa0c1f51fb9011d16124d4d9b037f23064ef0..0b143527ef86c6dd920c2a0178396a9a28be8729 100644
--- a/Sample/Particle/IBornFF.cpp
+++ b/Sample/Particle/IBornFF.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "Sample/Particle/IBornFF.h"
-#include "Sample/Particle/PolyhedralUtil.h"
#include "Base/Util/PyFmt.h"
#include "Base/Util/StringUtils.h"
#include "Base/Vector/WavevectorInfo.h"
+#include "Sample/Particle/PolyhedralUtil.h"
#include "Sample/Scattering/Rotations.h"
#include "Sample/Shapes/IShape3D.h"
#include <stdexcept>
diff --git a/Sample/Particle/PolyhedralUtil.h b/Sample/Particle/PolyhedralUtil.h
index 23c9cea9597b8680ad496adff8521f25979841cd..35db87837c0916c9e07aafdd79421339149642fb 100644
--- a/Sample/Particle/PolyhedralUtil.h
+++ b/Sample/Particle/PolyhedralUtil.h
@@ -23,12 +23,12 @@ class IRotation;
namespace PolyhedralUtil {
- //! Calculates the z-coordinate of the lowest vertex after rotation
- double BottomZ(const std::vector<R3>& vertices, const IRotation* rotation);
+//! Calculates the z-coordinate of the lowest vertex after rotation
+double BottomZ(const std::vector<R3>& vertices, const IRotation* rotation);
- //! Calculates the z-coordinate of the highest vertex after rotation
- double TopZ(const std::vector<R3>& vertices, const IRotation* rotation);
-}
+//! Calculates the z-coordinate of the highest vertex after rotation
+double TopZ(const std::vector<R3>& vertices, const IRotation* rotation);
+} // namespace PolyhedralUtil
#endif // BORNAGAIN_SAMPLE_PARTICLE_POLYHEDRALUTIL_H
#endif // USER_API
diff --git a/auto/Wrap/libBornAgainBase_wrap.cpp b/auto/Wrap/libBornAgainBase_wrap.cpp
index 7c26accbb0dacab9f5fd03e9974b5209971fe887..038b2695a668602b960d9f6e39e5e13bf9cfa2c1 100644
--- a/auto/Wrap/libBornAgainBase_wrap.cpp
+++ b/auto/Wrap/libBornAgainBase_wrap.cpp
@@ -5254,7 +5254,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val)
SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/share/swig4.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/local/share/swig/4.0.2/typemaps/swigmacros.swg,104,%ifcplusplus@*/
const std::complex<double>&
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index f08f98a8b0ebfe57a1ab4cc033cd1489ab360816..68d6966fddc356996deb31b20d34ad0976e351ae 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -5294,7 +5294,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val)
SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/share/swig4.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/local/share/swig/4.0.2/typemaps/swigmacros.swg,104,%ifcplusplus@*/
const std::complex<double>&
diff --git a/auto/Wrap/libBornAgainDevice_wrap.cpp b/auto/Wrap/libBornAgainDevice_wrap.cpp
index 5199bf754a5a9c1ab3a1ceb1fa4702474c79f7c2..a65732d3e08f3e7859c8b1b4755cf57f26c5cf72 100644
--- a/auto/Wrap/libBornAgainDevice_wrap.cpp
+++ b/auto/Wrap/libBornAgainDevice_wrap.cpp
@@ -5300,7 +5300,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val)
SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/share/swig4.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/local/share/swig/4.0.2/typemaps/swigmacros.swg,104,%ifcplusplus@*/
const std::complex<double>&
diff --git a/auto/Wrap/libBornAgainFit_wrap.cpp b/auto/Wrap/libBornAgainFit_wrap.cpp
index 967b58283d3391a46fa83b85b9205ad3fd946dc6..89583e73f5aac60650afab96441692dd5621cfc0 100644
--- a/auto/Wrap/libBornAgainFit_wrap.cpp
+++ b/auto/Wrap/libBornAgainFit_wrap.cpp
@@ -5251,7 +5251,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val)
SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/share/swig4.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/local/share/swig/4.0.2/typemaps/swigmacros.swg,104,%ifcplusplus@*/
const std::complex<double>&
diff --git a/auto/Wrap/libBornAgainParam_wrap.cpp b/auto/Wrap/libBornAgainParam_wrap.cpp
index b5ea658d3a149c4b8a0e2381698077bde8ca0953..da859a92b9fcc7e81dc3fdb81fa1b20dcf793ba2 100644
--- a/auto/Wrap/libBornAgainParam_wrap.cpp
+++ b/auto/Wrap/libBornAgainParam_wrap.cpp
@@ -5259,7 +5259,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val)
SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/share/swig4.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/local/share/swig/4.0.2/typemaps/swigmacros.swg,104,%ifcplusplus@*/
const std::complex<double>&
diff --git a/auto/Wrap/libBornAgainResample_wrap.cpp b/auto/Wrap/libBornAgainResample_wrap.cpp
index c5215879e43dc0d00575004489de9374898994bb..1dd3d81da1bf343b4db7dea141a40e5731cfabaf 100644
--- a/auto/Wrap/libBornAgainResample_wrap.cpp
+++ b/auto/Wrap/libBornAgainResample_wrap.cpp
@@ -5243,7 +5243,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val)
SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/share/swig4.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/local/share/swig/4.0.2/typemaps/swigmacros.swg,104,%ifcplusplus@*/
const std::complex<double>&
diff --git a/auto/Wrap/libBornAgainSample_wrap.cpp b/auto/Wrap/libBornAgainSample_wrap.cpp
index 7728a7651b7327c7f167fccc176c18bcb47161fe..418b1c6ed769ee140ea86ac6d94fdca32d34fad6 100644
--- a/auto/Wrap/libBornAgainSample_wrap.cpp
+++ b/auto/Wrap/libBornAgainSample_wrap.cpp
@@ -5364,7 +5364,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val)
SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/share/swig4.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/local/share/swig/4.0.2/typemaps/swigmacros.swg,104,%ifcplusplus@*/
const std::complex<double>&