mv getter implementations to headers

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);

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();

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()) {

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:
 

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();

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);

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;

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();

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)

GUI/View/Canvas/MaskEditorCanvas.h

@@ -37,7 +37,7 @@ public:
 
     void resetContextMEC();
 
-    MaskGraphicsScene* getScene();
+    MaskGraphicsScene* getScene() { return m_scene; }
 
 signals:
     void changeActivityRequest(MaskEditorFlags::Activity);

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();

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);

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;

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; }
 

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;

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();
 

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;

GUI/View/Main/MainWindow.h

@@ -39,7 +39,7 @@ public:
     explicit MainWindow();
     ~MainWindow() override;
 
-    QProgressBar* progressBar();
+    QProgressBar* progressBar() { return m_progressBar; }
 
     ProjectManager* projectManager();
 

GUI/View/Realspace/RealspacePanel.cpp

@@ -63,8 +63,3 @@ QSize RealspacePanel::sizeHint() const
 {
     return {300, 300};
 }
-
-RealspaceWidget* RealspacePanel::widget()
-{
-    return m_widget;
-}

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;