Unecessary SampleViewComponents removed

GUI/coregui/Views/SampleView.cpp

@@ -20,13 +20,29 @@
 #include "SampleDesigner.h"
 #include "SamplePropertyWidget.h"
 #include "SampleToolBar.h"
-#include "SampleViewComponents.h"
 #include "mainwindow.h"
 #include "ApplicationModels.h"
+#include "SampleWidgetBox.h"
+#include "ItemTreeView.h"
 #include <QDockWidget>
 #include <QMenu>
 #include <QTimer>
 
+
+namespace {
+ItemTreeView *createTreeView(SampleModel *sampleModel, QWidget *parent)
+{
+    ItemTreeView *tree_view = new ItemTreeView(parent);
+    FilterPropertyProxy *proxy = new FilterPropertyProxy(1, parent);
+    proxy->setSourceModel(sampleModel);
+    tree_view->setModel(proxy);
+    tree_view->setAttribute(Qt::WA_MacShowFocusRect, false);
+    return tree_view;
+}
+
+}
+
+
 SampleView::SampleView(MainWindow *mainWindow)
     : Manhattan::FancyMainWindow(mainWindow)
     , m_docks(new SampleViewDocks(this))
@@ -76,10 +92,9 @@ void SampleView::initSubWindows()
     qFill(m_subWindows, m_subWindows + NUMBER_OF_SUB_WINDOWS,
           static_cast<QWidget*>(nullptr));
 
-    m_subWindows[WIDGET_BOX] =
-            SampleViewComponents::createWidgetBox(sampleDesigner(), this);
+    m_subWindows[WIDGET_BOX] = new SampleWidgetBox(sampleDesigner(), this);
 
-    m_tree_view = SampleViewComponents::createTreeView(m_models->sampleModel(), this);
+    m_tree_view = createTreeView(m_models->sampleModel(), this);
     m_subWindows[SAMPLE_TREE] = getTreeView();
     getTreeView()->expandAll();
     connect(getTreeView()->model(), SIGNAL(rowsInserted(QModelIndex,int,int)),

GUI/coregui/Views/SampleViewComponents.cpp

-// ************************************************************************** //
-//
-//  BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file      GUI/coregui/Views/SampleViewComponents.cpp
-//! @brief     Implements class SampleViewComponents
-//!
-//! @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)
-//
-// ************************************************************************** //
-
-#include "SampleViewComponents.h"
-#include "FilterPropertyProxy.h"
-
-
-SampleWidgetBox *SampleViewComponents::createWidgetBox(
-        SampleDesignerInterface *core, QWidget *parent)
-{
-    return new SampleWidgetBox(core, parent);
-}
-
-ItemTreeView *SampleViewComponents::createTreeView(
-        SampleModel *sampleModel, QWidget *parent)
-{
-    ItemTreeView *tree_view = new ItemTreeView(parent);
-    FilterPropertyProxy *proxy = new FilterPropertyProxy(1, parent);
-    proxy->setSourceModel(sampleModel);
-    tree_view->setModel(proxy);
-    tree_view->setAttribute(Qt::WA_MacShowFocusRect, false);
-    return tree_view;
-}
-
-
-

GUI/coregui/Views/SampleViewComponents.h

-// ************************************************************************** //
-//
-//  BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file      GUI/coregui/Views/SampleViewComponents.h
-//! @brief     Defines class SampleViewComponents
-//!
-//! @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 SAMPLEVIEWCOMPONENTS_H
-#define SAMPLEVIEWCOMPONENTS_H
-
-#include "ItemTreeView.h"
-#include "SampleModel.h"
-#include "SampleWidgetBox.h"
-
-
-
-//class BA_CORE_API_ SampleInfoStreamInterface : public QWidget
-//{
-//public:
-//    explicit SampleInfoStreamInterface(QWidget *parent = 0) : QWidget(parent)
-//    {
-//        setMinimumSize(128, 128);
-//        setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-
-//    }
-//};
-
-
-
-class BA_CORE_API_ SampleViewComponents
-{
-public:
-    static SampleWidgetBox *createWidgetBox(
-            SampleDesignerInterface *core, QWidget *parent);
-//    static SamplePropertyEditor *createPropertyEditor(
-//            QItemSelectionModel *selection_model, QWidget *parent);
-    static ItemTreeView *createTreeView(
-            SampleModel *sample_model, QWidget *parent);
-//    static SampleInfoStreamInterface *createInfoStream(QWidget *parent);
-};
-
-#endif // SAMPLEVIEWCOMPONENTS_H