Rename InstrumentEditorWidget to InstrumentEditor

GUI/Views/InstrumentWidgets/InstrumentEditorWidget.cpp → GUI/Views/InstrumentWidgets/InstrumentEditor.cpp

@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
-//! @brief     Implements class InstrumentEditorWidget
+//! @file      GUI/Views/InstrumentWidgets/InstrumentEditor.cpp
+//! @brief     Implements class InstrumentEditor
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Views/InstrumentWidgets/InstrumentEditorWidget.h"
+#include "GUI/Views/InstrumentWidgets/InstrumentEditor.h"
 #include "GUI/Models/DetectorItems.h"
 #include "GUI/Models/InstrumentItems.h"
 #include "GUI/Views/CommonWidgets/AdjustingScrollArea.h"
@@ -42,7 +42,7 @@ QString instrumentTypeName(InstrumentItem* instrument)
 
 } // namespace
 
-InstrumentEditorWidget::InstrumentEditorWidget(QWidget* parent)
+InstrumentEditor::InstrumentEditor(QWidget* parent)
     : QWidget(parent)
     , m_nameLineEdit(new QLineEdit(this))
     , m_typeLabel(new QLabel(this))
@@ -65,15 +65,15 @@ InstrumentEditorWidget::InstrumentEditorWidget(QWidget* parent)
     setLayout(mainLayout);
 
     connect(m_nameLineEdit, &QLineEdit::textChanged, this,
-            &InstrumentEditorWidget::onChangedEditor);
+            &InstrumentEditor::onChangedEditor);
 }
 
-QSize InstrumentEditorWidget::sizeHint() const
+QSize InstrumentEditor::sizeHint() const
 {
     return QSize(600, 600);
 }
 
-void InstrumentEditorWidget::setItem(InstrumentItem* instrument)
+void InstrumentEditor::setItem(InstrumentItem* instrument)
 {
     m_currentItem = instrument;
     updateWidgets();
@@ -81,7 +81,7 @@ void InstrumentEditorWidget::setItem(InstrumentItem* instrument)
     m_instrumentPresenter->setItem(instrument);
 }
 
-void InstrumentEditorWidget::onChangedEditor(const QString&)
+void InstrumentEditor::onChangedEditor(const QString&)
 {
     if (m_block_signals)
         return;
@@ -92,7 +92,7 @@ void InstrumentEditorWidget::onChangedEditor(const QString&)
 
 //! top block with instrument name
 
-QLayout* InstrumentEditorWidget::createTopLayout()
+QLayout* InstrumentEditor::createTopLayout()
 {
     auto result = new QFormLayout();
 
@@ -103,7 +103,7 @@ QLayout* InstrumentEditorWidget::createTopLayout()
     return result;
 }
 
-void InstrumentEditorWidget::updateWidgets()
+void InstrumentEditor::updateWidgets()
 {
     m_block_signals = true;
 

GUI/Views/InstrumentWidgets/InstrumentEditorWidget.h → GUI/Views/InstrumentWidgets/InstrumentEditor.h

@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/InstrumentWidgets/InstrumentEditorWidget.h
-//! @brief     Defines class InstrumentEditorWidget
+//! @file      GUI/Views/InstrumentWidgets/InstrumentEditor.h
+//! @brief     Defines class InstrumentEditor
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTEDITORWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTEDITORWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTEDITOR_H
+#define BORNAGAIN_GUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTEDITOR_H
 
 #include <QWidget>
 
@@ -26,11 +26,11 @@ class InstrumentPresenter;
 //! Main widget of InstrumentView. Contains InstrumentPresenter
 //! showing proper insturment editor for given instrument type.
 
-class InstrumentEditorWidget : public QWidget {
+class InstrumentEditor : public QWidget {
     Q_OBJECT
 
 public:
-    InstrumentEditorWidget(QWidget* parent = nullptr);
+    InstrumentEditor(QWidget* parent = nullptr);
 
     QSize sizeHint() const;
 

GUI/Views/InstrumentWidgets/InstrumentView.cpp

@@ -16,13 +16,13 @@
 #include "GUI/Models/InstrumentItems.h"
 #include "GUI/Models/InstrumentModel.h"
 #include "GUI/Views/CommonWidgets/StyledToolBar.h"
-#include "GUI/Views/InstrumentWidgets/InstrumentEditorWidget.h"
+#include "GUI/Views/InstrumentWidgets/InstrumentEditor.h"
 #include "GUI/Views/InstrumentWidgets/InstrumentSelectorWidget.h"
 #include <QBoxLayout>
 
 InstrumentView::InstrumentView(QWidget* parent, InstrumentModel* instrumentModel)
     : QWidget(parent)
-    , m_instrumentEditor(new ItemStackPresenter<InstrumentEditorWidget>(true))
+    , m_instrumentEditor(new ItemStackPresenter<InstrumentEditor>(true))
     , m_instrumentModel(instrumentModel)
 {
     auto horizontalLayout = new QHBoxLayout;

GUI/Views/InstrumentWidgets/InstrumentView.h

@@ -21,7 +21,7 @@
 class DetectorItem;
 class InstrumentViewToolBar;
 class InstrumentSelectorWidget;
-class InstrumentEditorWidget;
+class InstrumentEditor;
 class InstrumentModel;
 
 class InstrumentView : public QWidget {
@@ -38,7 +38,7 @@ protected:
 
 private:
     InstrumentSelectorWidget* m_instrumentSelector;
-    ItemStackPresenter<InstrumentEditorWidget>* m_instrumentEditor;
+    ItemStackPresenter<InstrumentEditor>* m_instrumentEditor;
     InstrumentModel* m_instrumentModel;
 };