GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r96:bc430a638f57

perrinel -

r96:bc430a638f57

parent child

Context file:

r96:bc430a638f57

app/src/MainWindow.cpp +2 -2

                 mainToolBar->addAction("A1");
                 // Widgets / controllers connections
-                connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem &)),
+                connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem *)),
-                        m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem &)));
+                        m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem *)));
                 /*    QLopGUI::registerMenuBar(menuBar());
                     this->setWindowIcon(QIcon(":/sciqlopLOGO.svg"));

core/include/DataSource/DataSourceController.h +1 -1

             signals:
                 /// Signal emitted when a structure has been set for a data source
-                void dataSourceItemSet(DataSourceItem &dataSourceItem);
+                void dataSourceItemSet(DataSourceItem *dataSourceItem);
             private:
                 void waitForFinish();

core/src/DataSource/DataSourceController.cpp +1 -1

                     // Retrieves the data source item to emit the signal with it
                     auto it = impl->m_DataSourceItems.find(dataSourceUid);
                     if (it != impl->m_DataSourceItems.end()) {
-                        emit dataSourceItemSet(*it->second);
+                        emit dataSourceItemSet(it->second.get());
                     }
                 }
                 else {

core/tests/DataSource/TestDataSourceController.cpp +1 -1

                 DataSourceController dataSourceController{};
                 // Spy to test controllers' signals
-                QSignalSpy signalSpy{&dataSourceController, SIGNAL(dataSourceItemSet(const DataSourceItem &))};
+                QSignalSpy signalSpy{&dataSourceController, SIGNAL(dataSourceItemSet(DataSourceItem *))};
                 // Create a data source item
                 auto source1Name = QStringLiteral("Source1");

gui/include/DataSource/DataSourceWidget.h +2 -2

                 /**
                  * Adds a data source. An item associated to the data source is created and then added to the
                  * representation tree
-                 * @param dataSource the data source to add
+                 * @param dataSource the data source to add. The pointer has to be not null
                  */
-                void addDataSource(DataSourceItem &dataSource) noexcept;
+                void addDataSource(DataSourceItem *dataSource) noexcept;
             private:
                 class DataSourceWidgetPrivate;

gui/src/DataSource/DataSourceTreeWidgetItem.cpp +7 0

                             // No action
                             break;
                     }
+                    qCWarning(LOG_DataSourceTreeWidgetItem())
+                        << QObject::tr("Can't set data source icon : unknown data source type");
+                }
+                else {
+                    qCWarning(LOG_DataSourceTreeWidgetItem())
+                        << QObject::tr("Can't set data source icon : the data source is null");
                 }
                 // Default cases

gui/src/DataSource/DataSourceWidget.cpp +4 -2

             {
             }
-            void DataSourceWidget::addDataSource(DataSourceItem &dataSource) noexcept
+            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
-                impl->m_Ui->treeWidget->addTopLevelItem(createTreeWidgetItem(&dataSource));
+                if (dataSource) {
+                    impl->m_Ui->treeWidget->addTopLevelItem(createTreeWidgetItem(dataSource));
+                }
             }

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages