From d84febc6ca39a69c4814a9d34c82141f50734f82 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 11 Dec 2023 14:09:14 +0100
Subject: [PATCH] mv getter implementations to headers
---
GUI/Model/Device/MultiInstrumentNotifier.cpp | 6 ------
GUI/Model/Device/MultiInstrumentNotifier.h | 2 +-
GUI/View/Access/DataAccessWidget.cpp | 6 ------
GUI/View/Access/DataAccessWidget.h | 2 +-
GUI/View/Canvas/ColorMapCanvas.cpp | 6 ------
GUI/View/Canvas/ColorMapCanvas.h | 2 +-
GUI/View/Canvas/MaskEditorActions.cpp | 6 ------
GUI/View/Canvas/MaskEditorActions.h | 2 +-
GUI/View/Canvas/MaskEditorCanvas.cpp | 6 ------
GUI/View/Canvas/MaskEditorCanvas.h | 2 +-
GUI/View/Canvas/SpecularPlotCanvas.cpp | 6 ------
GUI/View/Canvas/SpecularPlotCanvas.h | 2 +-
GUI/View/Dock/DockWidgetInfo.cpp | 6 ------
GUI/View/Dock/DockWidgetInfo.h | 2 +-
GUI/View/Instrument/DistributionSelector.cpp | 6 ------
GUI/View/Instrument/DistributionSelector.h | 2 +-
GUI/View/Main/MainWindow.cpp | 6 ------
GUI/View/Main/MainWindow.h | 2 +-
GUI/View/Realspace/RealspacePanel.cpp | 5 -----
GUI/View/Realspace/RealspacePanel.h | 2 +-
GUI/View/Sample/CompoundForm.cpp | 6 ------
GUI/View/Sample/CompoundForm.h | 2 +-
GUI/View/Sample/CoreAndShellForm.cpp | 5 -----
GUI/View/Sample/CoreAndShellForm.h | 2 +-
GUI/View/Sample/InterferenceForm.cpp | 6 ------
GUI/View/Sample/InterferenceForm.h | 2 +-
GUI/View/Sample/LatticeTypeSelectionForm.cpp | 5 -----
GUI/View/Sample/LatticeTypeSelectionForm.h | 2 +-
GUI/View/Sample/LayerForm.cpp | 5 -----
GUI/View/Sample/LayerForm.h | 2 +-
GUI/View/Sample/MaterialInplaceForm.cpp | 6 ------
GUI/View/Sample/MaterialInplaceForm.h | 2 +-
GUI/View/Sample/MesocrystalForm.cpp | 5 -----
GUI/View/Sample/MesocrystalForm.h | 2 +-
GUI/View/Sample/ParticleLayoutForm.cpp | 6 ------
GUI/View/Sample/ParticleLayoutForm.h | 2 +-
GUI/View/Sample/SampleEditorController.cpp | 12 ------------
GUI/View/Sample/SampleEditorController.h | 4 ++--
GUI/View/Sample/SampleListing.cpp | 12 ------------
GUI/View/Sample/SampleListing.h | 4 ++--
PyCore/Embed/PyObjectPtr.cpp | 6 ------
PyCore/Embed/PyObjectPtr.h | 2 +-
42 files changed, 23 insertions(+), 156 deletions(-)
diff --git a/GUI/Model/Device/MultiInstrumentNotifier.cpp b/GUI/Model/Device/MultiInstrumentNotifier.cpp
index 5dd5b65743a..100406df592 100644
--- a/GUI/Model/Device/MultiInstrumentNotifier.cpp
+++ b/GUI/Model/Device/MultiInstrumentNotifier.cpp
@@ -19,12 +19,6 @@ MultiInstrumentNotifier::MultiInstrumentNotifier(InstrumentModel* instruments)
: m_instruments(instruments)
{
}
-
-InstrumentModel* MultiInstrumentNotifier::instrumentModel()
-{
- return m_instruments;
-}
-
void MultiInstrumentNotifier::removeInstrument(InstrumentItem* instrument)
{
m_instruments->removeInstrument(instrument);
diff --git a/GUI/Model/Device/MultiInstrumentNotifier.h b/GUI/Model/Device/MultiInstrumentNotifier.h
index bea47301be9..3c03f1e27ec 100644
--- a/GUI/Model/Device/MultiInstrumentNotifier.h
+++ b/GUI/Model/Device/MultiInstrumentNotifier.h
@@ -43,7 +43,7 @@ public:
MultiInstrumentNotifier(InstrumentModel* instruments);
//! The list of existing instruments.
- InstrumentModel* instrumentModel();
+ InstrumentModel* instrumentModel() { return m_instruments; }
//! Add an instrument and emit the respective signal.
template <typename T> T* addInstrumentItem();
diff --git a/GUI/View/Access/DataAccessWidget.cpp b/GUI/View/Access/DataAccessWidget.cpp
index 4688a96a751..a95dd5ad619 100644
--- a/GUI/View/Access/DataAccessWidget.cpp
+++ b/GUI/View/Access/DataAccessWidget.cpp
@@ -49,12 +49,6 @@ DatafileItem* DataAccessWidget::realItem() const
{
return dynamic_cast<DatafileItem*>(m_item);
}
-
-QObject* DataAccessWidget::jobRealBase() const
-{
- return m_item;
-}
-
Data1DItem* DataAccessWidget::realData1DItem() const
{
if (jobItem()) {
diff --git a/GUI/View/Access/DataAccessWidget.h b/GUI/View/Access/DataAccessWidget.h
index 1468f3a5753..978db183d4b 100644
--- a/GUI/View/Access/DataAccessWidget.h
+++ b/GUI/View/Access/DataAccessWidget.h
@@ -40,7 +40,7 @@ public:
JobItem* jobItem() const;
DatafileItem* realItem() const;
- QObject* jobRealBase() const;
+ QObject* jobRealBase() const { return m_item; }
//... Access to concrete items:
diff --git a/GUI/View/Canvas/ColorMapCanvas.cpp b/GUI/View/Canvas/ColorMapCanvas.cpp
index c13a8b9b68b..0fd42664bd1 100644
--- a/GUI/View/Canvas/ColorMapCanvas.cpp
+++ b/GUI/View/Canvas/ColorMapCanvas.cpp
@@ -40,12 +40,6 @@ void ColorMapCanvas::itemToCanvas(Data2DItem* item)
{
m_colorMap->itemToMap(item);
}
-
-ColorMap* ColorMapCanvas::colorMap()
-{
- return m_colorMap;
-}
-
QCustomPlot* ColorMapCanvas::customPlot()
{
return m_colorMap->customPlot();
diff --git a/GUI/View/Canvas/ColorMapCanvas.h b/GUI/View/Canvas/ColorMapCanvas.h
index 67d9e616699..40f8b165389 100644
--- a/GUI/View/Canvas/ColorMapCanvas.h
+++ b/GUI/View/Canvas/ColorMapCanvas.h
@@ -33,7 +33,7 @@ public:
void itemToCanvas(Data2DItem* item);
- ColorMap* colorMap();
+ ColorMap* colorMap() { return m_colorMap; }
QCustomPlot* customPlot();
void setStatusLabelEnabled(bool flag);
diff --git a/GUI/View/Canvas/MaskEditorActions.cpp b/GUI/View/Canvas/MaskEditorActions.cpp
index 2e83f7b522d..9319ff6fb82 100644
--- a/GUI/View/Canvas/MaskEditorActions.cpp
+++ b/GUI/View/Canvas/MaskEditorActions.cpp
@@ -72,12 +72,6 @@ void MaskEditorActions::setModels(MaskContainerModel* maskContainerModel,
m_maskContainerModel = maskContainerModel;
m_selectionModel = selectionModel;
}
-
-QAction* MaskEditorActions::sendToBackAction()
-{
- return m_sendToBackAction;
-}
-
QAction* MaskEditorActions::bringToFrontAction()
{
return m_bringToFrontAction;
diff --git a/GUI/View/Canvas/MaskEditorActions.h b/GUI/View/Canvas/MaskEditorActions.h
index d0242ddf4cc..1bac33b34b5 100644
--- a/GUI/View/Canvas/MaskEditorActions.h
+++ b/GUI/View/Canvas/MaskEditorActions.h
@@ -36,7 +36,7 @@ public:
void setModels(MaskContainerModel* maskContainerModel, QItemSelectionModel* selectionModel);
- QAction* sendToBackAction();
+ QAction* sendToBackAction() { return m_sendToBackAction; }
QAction* bringToFrontAction();
QList<QAction*> topToolbarActions();
diff --git a/GUI/View/Canvas/MaskEditorCanvas.cpp b/GUI/View/Canvas/MaskEditorCanvas.cpp
index 586e296562d..8de6e1b7a06 100644
--- a/GUI/View/Canvas/MaskEditorCanvas.cpp
+++ b/GUI/View/Canvas/MaskEditorCanvas.cpp
@@ -66,12 +66,6 @@ void MaskEditorCanvas::resetContextMEC()
m_scene->dissociateItems();
m_statusLabel->reset();
}
-
-MaskGraphicsScene* MaskEditorCanvas::getScene()
-{
- return m_scene;
-}
-
void MaskEditorCanvas::onPresentationChange(bool pixelized)
{
m_scene->clearSelection(); // important to avoid crash (unsubscribe while calling subscribers)
diff --git a/GUI/View/Canvas/MaskEditorCanvas.h b/GUI/View/Canvas/MaskEditorCanvas.h
index def57b9cfec..9d4d2dccd95 100644
--- a/GUI/View/Canvas/MaskEditorCanvas.h
+++ b/GUI/View/Canvas/MaskEditorCanvas.h
@@ -37,7 +37,7 @@ public:
void resetContextMEC();
- MaskGraphicsScene* getScene();
+ MaskGraphicsScene* getScene() { return m_scene; }
signals:
void changeActivityRequest(MaskEditorFlags::Activity);
diff --git a/GUI/View/Canvas/SpecularPlotCanvas.cpp b/GUI/View/Canvas/SpecularPlotCanvas.cpp
index e8751e4699a..654042f31ab 100644
--- a/GUI/View/Canvas/SpecularPlotCanvas.cpp
+++ b/GUI/View/Canvas/SpecularPlotCanvas.cpp
@@ -39,12 +39,6 @@ void SpecularPlotCanvas::setData1DItems(const QList<Data1DItem*>& data1DItems)
{
m_plot->setData1DItems(data1DItems);
}
-
-SpecularPlot* SpecularPlotCanvas::specularPlot()
-{
- return m_plot;
-}
-
QCustomPlot* SpecularPlotCanvas::customPlot()
{
return m_plot->customPlot();
diff --git a/GUI/View/Canvas/SpecularPlotCanvas.h b/GUI/View/Canvas/SpecularPlotCanvas.h
index 6836ca724ab..495543aaf9a 100644
--- a/GUI/View/Canvas/SpecularPlotCanvas.h
+++ b/GUI/View/Canvas/SpecularPlotCanvas.h
@@ -32,7 +32,7 @@ public:
void setData1DItems(const QList<Data1DItem*>& data1DItems);
- SpecularPlot* specularPlot();
+ SpecularPlot* specularPlot() { return m_plot; }
QCustomPlot* customPlot();
void setStatusLabelEnabled(bool flag);
diff --git a/GUI/View/Dock/DockWidgetInfo.cpp b/GUI/View/Dock/DockWidgetInfo.cpp
index b9d74795a4b..b6230667194 100644
--- a/GUI/View/Dock/DockWidgetInfo.cpp
+++ b/GUI/View/Dock/DockWidgetInfo.cpp
@@ -27,12 +27,6 @@ DockWidgetInfo::DockWidgetInfo(QDockWidget* dock, QWidget* widget, Qt::DockWidge
, m_area(area)
{
}
-
-QDockWidget* DockWidgetInfo::dock()
-{
- return m_dock;
-}
-
QWidget* DockWidgetInfo::widget()
{
return m_widget;
diff --git a/GUI/View/Dock/DockWidgetInfo.h b/GUI/View/Dock/DockWidgetInfo.h
index 5f040cbd709..2322b5a4b43 100644
--- a/GUI/View/Dock/DockWidgetInfo.h
+++ b/GUI/View/Dock/DockWidgetInfo.h
@@ -26,7 +26,7 @@ public:
DockWidgetInfo();
DockWidgetInfo(QDockWidget* dock, QWidget* widget, Qt::DockWidgetArea area);
- QDockWidget* dock();
+ QDockWidget* dock() { return m_dock; }
QWidget* widget();
Qt::DockWidgetArea area() { return m_area; }
diff --git a/GUI/View/Instrument/DistributionSelector.cpp b/GUI/View/Instrument/DistributionSelector.cpp
index 32d0dba3427..735a571f45c 100644
--- a/GUI/View/Instrument/DistributionSelector.cpp
+++ b/GUI/View/Instrument/DistributionSelector.cpp
@@ -132,12 +132,6 @@ void DistributionSelector::createMeanSpinBox(DoubleProperty& d)
createSpinBox(d);
}
}
-
-BeamDistributionItem* DistributionSelector::item() const
-{
- return m_item;
-}
-
GUI::ID::Distributions DistributionSelector::distributions() const
{
return m_distributions;
diff --git a/GUI/View/Instrument/DistributionSelector.h b/GUI/View/Instrument/DistributionSelector.h
index 0bfac960dc2..d27a3cb963f 100644
--- a/GUI/View/Instrument/DistributionSelector.h
+++ b/GUI/View/Instrument/DistributionSelector.h
@@ -47,7 +47,7 @@ public:
GUI::ID::Distributions distributions, QWidget* parent,
BeamDistributionItem* item, bool allow_distr);
- BeamDistributionItem* item() const;
+ BeamDistributionItem* item() const { return m_item; }
GUI::ID::Distributions distributions() const;
void refresh();
diff --git a/GUI/View/Main/MainWindow.cpp b/GUI/View/Main/MainWindow.cpp
index da479aa7fe1..d7c864c44f1 100644
--- a/GUI/View/Main/MainWindow.cpp
+++ b/GUI/View/Main/MainWindow.cpp
@@ -102,12 +102,6 @@ MainWindow::MainWindow()
}
MainWindow::~MainWindow() = default;
-
-QProgressBar* MainWindow::progressBar()
-{
- return m_progressBar;
-}
-
ProjectManager* MainWindow::projectManager()
{
return m_projectManager;
diff --git a/GUI/View/Main/MainWindow.h b/GUI/View/Main/MainWindow.h
index 2d92c7bc485..b6e4bd2a85e 100644
--- a/GUI/View/Main/MainWindow.h
+++ b/GUI/View/Main/MainWindow.h
@@ -39,7 +39,7 @@ public:
explicit MainWindow();
~MainWindow() override;
- QProgressBar* progressBar();
+ QProgressBar* progressBar() { return m_progressBar; }
ProjectManager* projectManager();
diff --git a/GUI/View/Realspace/RealspacePanel.cpp b/GUI/View/Realspace/RealspacePanel.cpp
index 7b9eee9081e..0f9e13bed55 100644
--- a/GUI/View/Realspace/RealspacePanel.cpp
+++ b/GUI/View/Realspace/RealspacePanel.cpp
@@ -63,8 +63,3 @@ QSize RealspacePanel::sizeHint() const
{
return {300, 300};
}
-
-RealspaceWidget* RealspacePanel::widget()
-{
- return m_widget;
-}
diff --git a/GUI/View/Realspace/RealspacePanel.h b/GUI/View/Realspace/RealspacePanel.h
index 545540334d8..0af3e12a8c3 100644
--- a/GUI/View/Realspace/RealspacePanel.h
+++ b/GUI/View/Realspace/RealspacePanel.h
@@ -27,7 +27,7 @@ public:
RealspacePanel(QWidget* parent);
QSize sizeHint() const override;
- RealspaceWidget* widget();
+ RealspaceWidget* widget() { return m_widget; }
private:
RealspaceWidget* m_widget;
diff --git a/GUI/View/Sample/CompoundForm.cpp b/GUI/View/Sample/CompoundForm.cpp
index 45051782b81..cf86dcf154d 100644
--- a/GUI/View/Sample/CompoundForm.cpp
+++ b/GUI/View/Sample/CompoundForm.cpp
@@ -70,12 +70,6 @@ CompoundForm::CompoundForm(QWidget* parent, CompoundItem* compoundItem, SampleEd
}
CompoundForm::~CompoundForm() = default;
-
-CompoundItem* CompoundForm::compositionItem() const
-{
- return m_compositionItem;
-}
-
void CompoundForm::onParticleAdded(ItemWithParticles* item)
{
int index = m_compositionItem->itemsWithParticles().indexOf(item);
diff --git a/GUI/View/Sample/CompoundForm.h b/GUI/View/Sample/CompoundForm.h
index bba78a3c833..4d35032981a 100644
--- a/GUI/View/Sample/CompoundForm.h
+++ b/GUI/View/Sample/CompoundForm.h
@@ -30,7 +30,7 @@ public:
bool allowRemove = true);
~CompoundForm();
- CompoundItem* compositionItem() const;
+ CompoundItem* compositionItem() const { return m_compositionItem; }
void onParticleAdded(ItemWithParticles* item);
void onAboutToRemoveParticle(ItemWithParticles* item);
diff --git a/GUI/View/Sample/CoreAndShellForm.cpp b/GUI/View/Sample/CoreAndShellForm.cpp
index 51a79e1d6b3..9090c2d1d74 100644
--- a/GUI/View/Sample/CoreAndShellForm.cpp
+++ b/GUI/View/Sample/CoreAndShellForm.cpp
@@ -203,8 +203,3 @@ void CoreAndShellForm::enableStructureEditing(bool b)
m_removeAction->setVisible(b);
m_duplicateAction->setVisible(b);
}
-
-CoreAndShellItem* CoreAndShellForm::coreShellItem() const
-{
- return m_item;
-}
diff --git a/GUI/View/Sample/CoreAndShellForm.h b/GUI/View/Sample/CoreAndShellForm.h
index 5459391d5d3..82e76857160 100644
--- a/GUI/View/Sample/CoreAndShellForm.h
+++ b/GUI/View/Sample/CoreAndShellForm.h
@@ -31,7 +31,7 @@ public:
bool allowRemove = true);
void enableStructureEditing(bool b);
- CoreAndShellItem* coreShellItem() const;
+ CoreAndShellItem* coreShellItem() const { return m_item; }
void createCoreWidgets();
void createShellWidgets();
diff --git a/GUI/View/Sample/InterferenceForm.cpp b/GUI/View/Sample/InterferenceForm.cpp
index 3f6c294660e..c60f9c8d4c1 100644
--- a/GUI/View/Sample/InterferenceForm.cpp
+++ b/GUI/View/Sample/InterferenceForm.cpp
@@ -46,12 +46,6 @@ InterferenceForm::InterferenceForm(QWidget* parent, ParticleLayoutItem* layoutIt
connect(m_interferenceTypeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
[this](int newIndex) { m_ec->selectInterference(this, newIndex); });
}
-
-ParticleLayoutItem* InterferenceForm::layoutItem() const
-{
- return m_layoutItem;
-}
-
void InterferenceForm::onInterferenceTypeChanged()
{
while (m_layout->rowCount() > 1)
diff --git a/GUI/View/Sample/InterferenceForm.h b/GUI/View/Sample/InterferenceForm.h
index ead2a6bccb8..d11f93b83ca 100644
--- a/GUI/View/Sample/InterferenceForm.h
+++ b/GUI/View/Sample/InterferenceForm.h
@@ -28,7 +28,7 @@ class InterferenceForm : public CollapsibleGroupBox {
public:
InterferenceForm(QWidget* parent, ParticleLayoutItem* layoutItem, SampleEditorController* ec);
- ParticleLayoutItem* layoutItem() const;
+ ParticleLayoutItem* layoutItem() const { return m_layoutItem; }
void onInterferenceTypeChanged();
private:
diff --git a/GUI/View/Sample/LatticeTypeSelectionForm.cpp b/GUI/View/Sample/LatticeTypeSelectionForm.cpp
index 4dc8f4f347d..fef6f7826d5 100644
--- a/GUI/View/Sample/LatticeTypeSelectionForm.cpp
+++ b/GUI/View/Sample/LatticeTypeSelectionForm.cpp
@@ -67,8 +67,3 @@ void LatticeTypeSelectionForm::updateXiVisibility()
m_xiLabel->setVisible(!m_interferenceItem->xiIntegration());
m_xiLabel->buddy()->setVisible(!m_interferenceItem->xiIntegration());
}
-
-Interference2DAbstractLatticeItem* LatticeTypeSelectionForm::interferenceItem() const
-{
- return m_interferenceItem;
-}
diff --git a/GUI/View/Sample/LatticeTypeSelectionForm.h b/GUI/View/Sample/LatticeTypeSelectionForm.h
index 6a6ceea9829..f345e02d2b6 100644
--- a/GUI/View/Sample/LatticeTypeSelectionForm.h
+++ b/GUI/View/Sample/LatticeTypeSelectionForm.h
@@ -32,7 +32,7 @@ public:
void onIntegrateOverXiChanged();
void updateXiVisibility();
- Interference2DAbstractLatticeItem* interferenceItem() const;
+ Interference2DAbstractLatticeItem* interferenceItem() const { return m_interferenceItem; }
private:
Interference2DAbstractLatticeItem* m_interferenceItem;
diff --git a/GUI/View/Sample/LayerForm.cpp b/GUI/View/Sample/LayerForm.cpp
index 71dca5ff23d..6908c31a44b 100644
--- a/GUI/View/Sample/LayerForm.cpp
+++ b/GUI/View/Sample/LayerForm.cpp
@@ -214,8 +214,3 @@ void LayerForm::onAboutToRemoveLayout(ParticleLayoutItem* layoutItem)
m_layout->removeRow(rowInLayout);
}
-
-LayerItem* LayerForm::layerItem() const
-{
- return m_layer;
-}
diff --git a/GUI/View/Sample/LayerForm.h b/GUI/View/Sample/LayerForm.h
index ab7153644d8..cfed7ba7ca0 100644
--- a/GUI/View/Sample/LayerForm.h
+++ b/GUI/View/Sample/LayerForm.h
@@ -34,7 +34,7 @@ public:
void updateLayerPositionDependentElements();
void onLayoutAdded(ParticleLayoutItem* layoutItem);
void onAboutToRemoveLayout(ParticleLayoutItem* layoutItem);
- LayerItem* layerItem() const;
+ LayerItem* layerItem() const { return m_layer; }
void updateTitle();
void expand();
diff --git a/GUI/View/Sample/MaterialInplaceForm.cpp b/GUI/View/Sample/MaterialInplaceForm.cpp
index dd371cb86d4..6bf95c3f43f 100644
--- a/GUI/View/Sample/MaterialInplaceForm.cpp
+++ b/GUI/View/Sample/MaterialInplaceForm.cpp
@@ -41,12 +41,6 @@ MaterialInplaceForm::MaterialInplaceForm(ItemWithMaterial* item, SampleEditorCon
connect(itemWithMaterial()->materialItem(), &MaterialItem::dataChanged, this,
&MaterialInplaceForm::updateValues);
}
-
-ItemWithMaterial* MaterialInplaceForm::itemWithMaterial() const
-{
- return m_item;
-}
-
void MaterialInplaceForm::updateValues()
{
for (auto* editor : findChildren<DoubleSpinBox*>()) {
diff --git a/GUI/View/Sample/MaterialInplaceForm.h b/GUI/View/Sample/MaterialInplaceForm.h
index 93abaa0a3d6..98d401699e1 100644
--- a/GUI/View/Sample/MaterialInplaceForm.h
+++ b/GUI/View/Sample/MaterialInplaceForm.h
@@ -27,7 +27,7 @@ class MaterialInplaceForm : public QWidget {
public:
MaterialInplaceForm(ItemWithMaterial* item, SampleEditorController* ec);
- ItemWithMaterial* itemWithMaterial() const;
+ ItemWithMaterial* itemWithMaterial() const { return m_item; }
void updateValues();
private:
diff --git a/GUI/View/Sample/MesocrystalForm.cpp b/GUI/View/Sample/MesocrystalForm.cpp
index 5d504f6cca6..596316c8843 100644
--- a/GUI/View/Sample/MesocrystalForm.cpp
+++ b/GUI/View/Sample/MesocrystalForm.cpp
@@ -123,8 +123,3 @@ void MesocrystalForm::createBasisWidgets()
m_layout->addRow(LayerEditorUtil::createWidgetForItemWithParticles(this, m_item->basisItem(),
false, m_ec, false));
}
-
-MesocrystalItem* MesocrystalForm::mesocrystalItem() const
-{
- return m_item;
-}
diff --git a/GUI/View/Sample/MesocrystalForm.h b/GUI/View/Sample/MesocrystalForm.h
index 729fef78e89..302a816cfe9 100644
--- a/GUI/View/Sample/MesocrystalForm.h
+++ b/GUI/View/Sample/MesocrystalForm.h
@@ -30,7 +30,7 @@ public:
MesocrystalForm(QWidget* parent, MesocrystalItem* mesocrystalItem, SampleEditorController* ec,
bool allowRemove = true);
- MesocrystalItem* mesocrystalItem() const;
+ MesocrystalItem* mesocrystalItem() const { return m_item; }
void createBasisWidgets();
private:
diff --git a/GUI/View/Sample/ParticleLayoutForm.cpp b/GUI/View/Sample/ParticleLayoutForm.cpp
index 0aad34eeda8..45e4233a547 100644
--- a/GUI/View/Sample/ParticleLayoutForm.cpp
+++ b/GUI/View/Sample/ParticleLayoutForm.cpp
@@ -95,12 +95,6 @@ void ParticleLayoutForm::enableStructureEditing(bool b)
for (auto* w : m_structureEditingWidgets)
w->setVisible(b);
}
-
-ParticleLayoutItem* ParticleLayoutForm::layoutItem() const
-{
- return m_layoutItem;
-}
-
void ParticleLayoutForm::onParticleAdded(ItemWithParticles* item)
{
int index = m_layoutItem->itemsWithParticles().indexOf(item);
diff --git a/GUI/View/Sample/ParticleLayoutForm.h b/GUI/View/Sample/ParticleLayoutForm.h
index c7892355e6b..ecfde5c8307 100644
--- a/GUI/View/Sample/ParticleLayoutForm.h
+++ b/GUI/View/Sample/ParticleLayoutForm.h
@@ -34,7 +34,7 @@ public:
SampleEditorController* ec);
void enableStructureEditing(bool b);
- ParticleLayoutItem* layoutItem() const;
+ ParticleLayoutItem* layoutItem() const { return m_layoutItem; }
void onParticleAdded(ItemWithParticles* item);
void onAboutToRemoveParticle(ItemWithParticles* item);
diff --git a/GUI/View/Sample/SampleEditorController.cpp b/GUI/View/Sample/SampleEditorController.cpp
index 30a00cdc5aa..6aa5076c20e 100644
--- a/GUI/View/Sample/SampleEditorController.cpp
+++ b/GUI/View/Sample/SampleEditorController.cpp
@@ -46,12 +46,6 @@ void SampleEditorController::setSampleForm(SampleForm* view)
{
m_sampleForm = view;
}
-
-SampleItem* SampleEditorController::sampleItem() const
-{
- return m_sampleItem;
-}
-
void SampleEditorController::addLayerItem(LayerItem* before)
{
const int i = (before != nullptr) ? m_sampleItem->layerItems().indexOf(before)
@@ -356,12 +350,6 @@ MaterialModel* SampleEditorController::materialModel() const
{
return &m_sampleItem->materialModel();
}
-
-ProjectDocument* SampleEditorController::projectDocument() const
-{
- return m_document;
-}
-
void SampleEditorController::selectMaterial(ItemWithMaterial* item,
const QString& newMaterialIdentifier)
{
diff --git a/GUI/View/Sample/SampleEditorController.h b/GUI/View/Sample/SampleEditorController.h
index 71792337909..6e22907e20e 100644
--- a/GUI/View/Sample/SampleEditorController.h
+++ b/GUI/View/Sample/SampleEditorController.h
@@ -59,13 +59,13 @@ public:
void setSampleForm(SampleForm* view);
//! The item on which this controller operates.
- SampleItem* sampleItem() const;
+ SampleItem* sampleItem() const { return m_sampleItem; }
//! The materials of the current document
MaterialModel* materialModel() const;
//! The current document
- ProjectDocument* projectDocument() const;
+ ProjectDocument* projectDocument() const { return m_document; }
void addLayerItem(LayerItem* before);
QColor findColor(int atIndex);
diff --git a/GUI/View/Sample/SampleListing.cpp b/GUI/View/Sample/SampleListing.cpp
index ffe9943d858..f04b470055a 100644
--- a/GUI/View/Sample/SampleListing.cpp
+++ b/GUI/View/Sample/SampleListing.cpp
@@ -138,22 +138,10 @@ SampleItem* SampleListing::currentSampleItem()
{
return m_model->itemForIndex(currentIndex());
}
-
-QAction* SampleListing::newSampleAction()
-{
- return m_newSampleAction;
-}
-
QAction* SampleListing::importSampleAction()
{
return m_importSampleAction;
}
-
-QAction* SampleListing::chooseFromLibraryAction()
-{
- return m_chooseFromLibraryAction;
-}
-
QSize SampleListing::sizeHint() const
{
QSize s = QListView::sizeHint();
diff --git a/GUI/View/Sample/SampleListing.h b/GUI/View/Sample/SampleListing.h
index 6d6c2b14070..d59d7811b17 100644
--- a/GUI/View/Sample/SampleListing.h
+++ b/GUI/View/Sample/SampleListing.h
@@ -32,9 +32,9 @@ public:
void restoreSelection();
- QAction* newSampleAction();
+ QAction* newSampleAction() { return m_newSampleAction; }
QAction* importSampleAction();
- QAction* chooseFromLibraryAction();
+ QAction* chooseFromLibraryAction() { return m_chooseFromLibraryAction; }
QSize sizeHint() const override;
diff --git a/PyCore/Embed/PyObjectPtr.cpp b/PyCore/Embed/PyObjectPtr.cpp
index 789398ac426..b30a4237ce8 100644
--- a/PyCore/Embed/PyObjectPtr.cpp
+++ b/PyCore/Embed/PyObjectPtr.cpp
@@ -30,12 +30,6 @@ PyObjectPtr::PyObjectPtr(PyObjectPtr&& other)
: PyObjectPtr(other.release())
{
}
-
-PyObject* PyObjectPtr::get()
-{
- return m_ptr;
-}
-
PyObject* PyObjectPtr::release()
{
PyObject* pyobject_ptr{m_ptr};
diff --git a/PyCore/Embed/PyObjectPtr.h b/PyCore/Embed/PyObjectPtr.h
index 2ef79051661..aea8fe906e1 100644
--- a/PyCore/Embed/PyObjectPtr.h
+++ b/PyCore/Embed/PyObjectPtr.h
@@ -33,7 +33,7 @@ public:
PyObjectPtr& operator=(const PyObjectPtr&) = delete;
//! Returns the raw pointer to the PyObject
- PyObject* get();
+ PyObject* get() { return m_ptr; }
//! Resets the container to the initial status (does _not_ release the Python resource)
void reset();
//! Resets the container to the initial status and return the PyObject pointer
--
GitLab