diff --git a/gui/include/DataSource/DataSourceWidget.h b/gui/include/DataSource/DataSourceWidget.h index 19d351f..c661fa2 100644 --- a/gui/include/DataSource/DataSourceWidget.h +++ b/gui/include/DataSource/DataSourceWidget.h @@ -1,10 +1,12 @@ #ifndef SCIQLOP_DATASOURCEWIDGET_H #define SCIQLOP_DATASOURCEWIDGET_H -#include - #include +namespace Ui { +class DataSourceWidget; +} // Ui + class DataSourceItem; /** @@ -26,8 +28,7 @@ public slots: void addDataSource(DataSourceItem *dataSource) noexcept; private: - class DataSourceWidgetPrivate; - spimpl::unique_impl_ptr impl; + Ui::DataSourceWidget *ui; }; #endif // SCIQLOP_DATASOURCEWIDGET_H diff --git a/gui/src/DataSource/DataSourceWidget.cpp b/gui/src/DataSource/DataSourceWidget.cpp index 79749aa..0891a00 100644 --- a/gui/src/DataSource/DataSourceWidget.cpp +++ b/gui/src/DataSource/DataSourceWidget.cpp @@ -33,24 +33,13 @@ DataSourceTreeWidgetItem *createTreeWidgetItem(DataSourceItem *dataSource) } // namespace -class DataSourceWidget::DataSourceWidgetPrivate { -public: - explicit DataSourceWidgetPrivate(DataSourceWidget &widget) - : m_Ui{std::make_unique()} - { - m_Ui->setupUi(&widget); - - // Set tree properties - m_Ui->treeWidget->setColumnCount(TREE_NB_COLUMNS); - m_Ui->treeWidget->setHeaderLabels(TREE_HEADER_LABELS); - } - - std::unique_ptr m_Ui; -}; - -DataSourceWidget::DataSourceWidget(QWidget *parent) - : QWidget{parent}, impl{spimpl::make_unique_impl(*this)} +DataSourceWidget::DataSourceWidget(QWidget *parent) : QWidget{parent}, ui{new Ui::DataSourceWidget} { + ui->setupUi(this); + + // Set tree properties + ui->treeWidget->setColumnCount(TREE_NB_COLUMNS); + ui->treeWidget->setHeaderLabels(TREE_HEADER_LABELS); } void DataSourceWidget::addDataSource(DataSourceItem *dataSource) noexcept @@ -58,6 +47,6 @@ void DataSourceWidget::addDataSource(DataSourceItem *dataSource) noexcept // Creates the item associated to the source and adds it to the tree widget. The tree widget // takes the ownership of the item if (dataSource) { - impl->m_Ui->treeWidget->addTopLevelItem(createTreeWidgetItem(dataSource)); + ui->treeWidget->addTopLevelItem(createTreeWidgetItem(dataSource)); } }