[j.unused] rm unused, detected by xunused ()

Merging branch 'j.unused'  into 'main'.

See merge request !2256

Base/Py/PyFmt.cpp

@@ -185,16 +185,6 @@ std::string Py::Fmt::printFunction(const std::string& name, double value1, const
     return printFunction(name, {{value1, unit1}, {value2, unit2}});
 }
 
-bool Py::Fmt::isSquare(double length1, double length2, double angle)
-{
-    return length1 == length2 && Numeric::almostEqual(angle, (pi / 2), 2);
-}
-
-bool Py::Fmt::isHexagonal(double length1, double length2, double angle)
-{
-    return length1 == length2 && Numeric::almostEqual(angle, (2 * pi) / 3.0, 2);
-}
-
 std::string Py::Fmt::printKvector(const R3 value)
 {
     std::ostringstream result;

Base/Py/PyFmt.h

@@ -62,8 +62,6 @@ std::string printFunction(const std::string& name, double value, const std::stri
 std::string printFunction(const std::string& name, double value1, const std::string& unit1,
                           double value2, const std::string& unit2);
 
-bool isSquare(double length1, double length2, double angle);
-bool isHexagonal(double length1, double length2, double angle);
 std::string printKvector(R3 value);
 
 //! Returns a string of blanks with given width. By default

GUI/Model/Device/InstrumentNotifier.cpp

@@ -25,11 +25,6 @@ InstrumentNotifier::InstrumentNotifier(MultiInstrumentNotifier* ec, InstrumentIt
 {
 }
 
-void InstrumentNotifier::setInstrumentName(const QString& name)
-{
-    m_ec->setInstrumentName(m_instrumentItem, name);
-}
-
 void InstrumentNotifier::notifyWavelengthDistributionChanged()
 {
     // Update values in pointwise axis. This is necessary after a change of the mean wavelength.

GUI/Model/Device/InstrumentNotifier.h

@@ -35,11 +35,6 @@ class InstrumentNotifier : public QObject {
 public:
     InstrumentNotifier(MultiInstrumentNotifier* ec, InstrumentItem* instrument);
 
-    //! Set the instrument name and emit the respective signal.
-    //!
-    //! The signal is emitted by the parent MultiInstrumentNotifier.
-    void setInstrumentName(const QString& name);
-
     //! Update dependent data and emit a changed signal
     void notifyWavelengthDistributionChanged();
 

GUI/View/Canvas/SpecularDataCanvas.cpp

@@ -73,11 +73,6 @@ QList<QAction*> SpecularDataCanvas::actionList()
     return QList<QAction*>() << m_reset_view_action << m_save_plot_action;
 }
 
-QCustomPlot* SpecularDataCanvas::customPlot()
-{
-    return m_plot_canvas->customPlot();
-}
-
 void SpecularDataCanvas::enableDeprecatedOnMousePress(bool b)
 {
     if (b)

GUI/View/Canvas/SpecularDataCanvas.h

@@ -16,10 +16,8 @@
 #define BORNAGAIN_GUI_VIEW_CANVAS_SPECULARDATACANVAS_H
 
 #include "GUI/View/Access/DataAccessWidget.h"
-#include <QWidget>
 
 class Data1DItem;
-class QCustomPlot;
 class SpecularPlotCanvas;
 
 class SpecularDataCanvas : public DataAccessWidget {
@@ -33,7 +31,6 @@ public:
     QSize minimumSizeHint() const override;
 
     QList<QAction*> actionList() override;
-    QCustomPlot* customPlot();
 
     //! Enable or disable the onMousePress() handler.
     //! For legacy reasons the onMousePress handler is enabled.

GUI/View/Dock/DocksController.cpp

@@ -254,25 +254,6 @@ void DocksController::addDockActionsToMenu(QMenu* menu)
     }
 }
 
-void DocksController::saveSettings(QSettings* settings) const
-{
-    QHash<QString, QVariant> hash = saveSettings();
-    QHashIterator<QString, QVariant> it(hash);
-    while (it.hasNext()) {
-        it.next();
-        settings->setValue(it.key(), it.value());
-    }
-}
-
-void DocksController::restoreSettings(const QSettings* settings)
-{
-    QHash<QString, QVariant> hash;
-    foreach (const QString& key, settings->childKeys()) {
-        hash.insert(key, settings->value(key));
-    }
-    restoreSettings(hash);
-}
-
 QHash<QString, QVariant> DocksController::saveSettings() const
 {
     QHash<QString, QVariant> settings;

GUI/View/Dock/DocksController.h

@@ -45,9 +45,7 @@ public:
     void addDockActionsToMenu(QMenu* menu);
 
     QHash<QString, QVariant> saveSettings() const;
-    void saveSettings(QSettings* settings) const;
     void restoreSettings(const QHash<QString, QVariant>& settings);
-    void restoreSettings(const QSettings* settings);
 
 public slots:
     void setDockHeightForWidget(int height);

GUI/View/Info/DetailedMessageBox.cpp

@@ -60,19 +60,9 @@ DetailedMessageBox::DetailedMessageBox(QWidget* parent, const QString& title, co
     setSizeGripEnabled(true);
 }
 
-void DetailedMessageBox::setText(const QString& text)
-{
-    m_topLabel->setText(text);
-}
-
-void DetailedMessageBox::setDetailedText(const QString& text)
-{
-    m_textEdit->setText(text);
-}
-
 //! Returns layout with icon for left part of the widget.
 
-QBoxLayout* DetailedMessageBox::createLogoLayout()
+QBoxLayout* DetailedMessageBox::createLogoLayout() const
 {
     auto* result = new QVBoxLayout;
     result->setContentsMargins(5, 5, 5, 5);
@@ -89,7 +79,7 @@ QBoxLayout* DetailedMessageBox::createLogoLayout()
 
 //! Creates right layout with text and QComboBox selection.
 
-QBoxLayout* DetailedMessageBox::createInfoLayout()
+QBoxLayout* DetailedMessageBox::createInfoLayout() const
 {
     m_topLabel->setWordWrap(true);
 
@@ -101,7 +91,7 @@ QBoxLayout* DetailedMessageBox::createInfoLayout()
 
 //! Creates button layout with buttons.
 
-QBoxLayout* DetailedMessageBox::createButtonLayout()
+QBoxLayout* DetailedMessageBox::createButtonLayout() const
 {
     auto* result = new QHBoxLayout;
 

GUI/View/Info/DetailedMessageBox.h

@@ -30,13 +30,10 @@ public:
     DetailedMessageBox(QWidget* parent, const QString& title, const QString& text,
                        const QString& details);
 
-    void setText(const QString& text);
-    void setDetailedText(const QString& text);
-
 private:
-    QBoxLayout* createLogoLayout();
-    QBoxLayout* createInfoLayout();
-    QBoxLayout* createButtonLayout();
+    QBoxLayout* createLogoLayout() const;
+    QBoxLayout* createInfoLayout() const;
+    QBoxLayout* createButtonLayout() const;
 
     QLabel* m_topLabel;
     QTextEdit* m_textEdit;

GUI/View/Sample/LayerEditorUtil.cpp

@@ -27,24 +27,6 @@
 #include "GUI/View/Sample/SampleEditorController.h"
 #include <QMenu>
 
-using std::function;
-
-QString LayerEditorUtil::withUnit(QString text, const QString& unit)
-{
-    const bool hasColon = text.indexOf(":") > 0;
-    text = text.left(text.indexOf("["));
-    text = text.trimmed();
-    if (text.endsWith(":"))
-        text.chop(1);
-
-    if (!unit.isEmpty())
-        text += " (" + unit + ")";
-    if (hasColon)
-        text += ":";
-
-    return text;
-}
-
 void LayerEditorUtil::addMultiPropertyToGrid(QGridLayout* m_gridLayout, int firstCol,
                                              const DoubleProperties& valueProperties,
                                              SampleEditorController* ec, bool vertically,
@@ -58,10 +40,9 @@ void LayerEditorUtil::addMultiPropertyToGrid(QGridLayout* m_gridLayout, int firs
                            addSpacer);
 }
 
-void LayerEditorUtil::addMultiPropertyToGrid(QGridLayout* m_gridLayout, int firstCol,
-                                             const DoubleProperties& valueProperties,
-                                             function<void(double, DoubleProperty&)> setNewValue,
-                                             bool vertically, bool addSpacer)
+void LayerEditorUtil::addMultiPropertyToGrid(
+    QGridLayout* m_gridLayout, int firstCol, const DoubleProperties& valueProperties,
+    std::function<void(double, DoubleProperty&)> setNewValue, bool vertically, bool addSpacer)
 {
     int col = firstCol;
     for (auto* d : valueProperties) {

GUI/View/Sample/LayerEditorUtil.h

@@ -36,8 +36,6 @@ class VectorProperty;
 //! Utility functions to support layer oriented sample editor
 namespace LayerEditorUtil {
 
-QString withUnit(QString text, const QString& unit);
-
 //! Create DoubleSpinBoxes for the DoubleProperties and connect them to
 //! SampleEditorController::setDouble()
 void addMultiPropertyToGrid(QGridLayout* m_gridLayout, int firstCol,

GUI/View/Tool/LayoutUtil.cpp

@@ -109,9 +109,3 @@ void GUI::Util::Layout::removeColumn(QGridLayout* layout, int column, bool delet
     layout->setColumnMinimumWidth(column, 0);
     layout->setColumnStretch(column, 0);
 }
-
-void GUI::Util::Layout::clearGridLayout(QGridLayout* layout, bool deleteWidgets)
-{
-    for (int i_row = 0; i_row < layout->rowCount(); ++i_row)
-        GUI::Util::Layout::removeRow(layout, i_row, deleteWidgets);
-}

GUI/View/Tool/LayoutUtil.h

@@ -35,9 +35,6 @@ void removeRow(QGridLayout* layout, int row, bool deleteWidgets = true);
 //! Removes column from grid layout.
 void removeColumn(QGridLayout* layout, int column, bool deleteWidgets = true);
 
-//! Clear layout completely.
-void clearGridLayout(QGridLayout* layout, bool deleteWidgets = true);
-
 } // namespace GUI::Util::Layout
 
 #endif // BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTIL_H

Img3D/Build/Particle3DContainer.cpp

@@ -19,11 +19,6 @@ namespace Img3D {
 
 Particle3DContainer::~Particle3DContainer() = default;
 
-void Particle3DContainer::clearContainer()
-{
-    m_containerParticles.clear();
-}
-
 void Particle3DContainer::addParticle3D(Img3D::PlotParticle* particle3D)
 {
     m_containerParticles.emplace_back(particle3D);

Img3D/Build/Particle3DContainer.h

@@ -36,8 +36,6 @@ public:
     Particle3DContainer(Particle3DContainer&& other) = default;
     Particle3DContainer& operator=(Particle3DContainer&& rhs) = default;
 
-    void clearContainer();
-
     size_t containerSize() const { return m_containerParticles.size(); }
     double cumulativeAbundance() const { return m_cumulativeAbundance; }
 

Img3D/Model/PlottableBody.cpp

@@ -82,11 +82,6 @@ bool PlottableBody::isTransparent() const
     return color().alpha() < 255;
 }
 
-void PlottableBody::transform(float scale, F3 rotate, F3 translate)
-{
-    transform(F3(scale, scale, scale), rotate, translate);
-}
-
 void PlottableBody::transform(F3 scale, F3 rotate, F3 translate)
 {
     m_matrix.setToIdentity();

Img3D/Model/PlottableBody.h

@@ -35,7 +35,6 @@ public:
     const QColor& color() const { return m_color; }
     bool isTransparent() const;
 
-    void transform(float scale, F3 rotate, F3 translate);
     void transform(F3 scale, F3 rotate, F3 translate);
     void transform(F3 scale, QQuaternion, F3 translate);
     void transform(F3 turn, F3 scale, F3 rotate, F3 translate);

Img3D/Type/CameraParams.cpp

@@ -14,29 +14,11 @@
 
 #include "Img3D/Type/CameraParams.h"
 
-namespace Img3D {
-
-namespace {
-
-F3 interpolateF3(const F3& from, const F3& to, float rat)
-{
-    return from * (1 - rat) + to * rat;
-}
-
-} // namespace
-
-CameraParams::CameraParams(const F3& eye_, const F3& ctr_, const F3& up_, QQuaternion const& rot_)
+Img3D::CameraParams::CameraParams(const F3& eye_, const F3& ctr_, const F3& up_,
+                                  QQuaternion const& rot_)
     : eye(eye_)
     , ctr(ctr_)
     , up(up_)
     , rot(rot_)
 {
 }
-
-CameraParams CameraParams::interpolateTo(const CameraParams& to, float r) const
-{
-    return {interpolateF3(eye, to.eye, r), interpolateF3(ctr, to.ctr, r),
-            interpolateF3(up, to.up, r), QQuaternion::slerp(rot, to.rot, r)};
-}
-
-} // namespace Img3D

Img3D/Type/CameraParams.h

@@ -28,8 +28,6 @@ struct CameraParams {
     F3 ctr; // center
     F3 up;
     QQuaternion rot;
-
-    CameraParams interpolateTo(const CameraParams&, float) const;
 };
 
 } // namespace Img3D