From 0c19fc3b4512fdc11f5a3832f22f621ac5c965c2 Mon Sep 17 00:00:00 2001 From: Joachim Wuttke <j.wuttke@fz-juelich.de> Date: Mon, 26 Feb 2024 17:20:12 +0100 Subject: [PATCH] replace 'pushSample' by 'pushItem' --- GUI/View/List/SamplesQModel.cpp | 4 ++-- GUI/View/List/SamplesQModel.h | 2 +- GUI/View/Views/SampleView.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/GUI/View/List/SamplesQModel.cpp b/GUI/View/List/SamplesQModel.cpp index ccb9224c99f..2b83e9900b6 100644 --- a/GUI/View/List/SamplesQModel.cpp +++ b/GUI/View/List/SamplesQModel.cpp @@ -78,10 +78,10 @@ QModelIndex SamplesQModel::copySample() const SampleItem* t = set()->currentItem(); ASSERT(t); SampleItem* t2 = t->clone(); - return pushSample(t2); + return pushItem(t2); } -QModelIndex SamplesQModel::pushSample(SampleItem* t) +QModelIndex SamplesQModel::pushItem(SampleItem* t) { if (!t) return {}; diff --git a/GUI/View/List/SamplesQModel.h b/GUI/View/List/SamplesQModel.h index ee73b6281f5..a9b8d5d164c 100644 --- a/GUI/View/List/SamplesQModel.h +++ b/GUI/View/List/SamplesQModel.h @@ -32,7 +32,7 @@ public: void removeSample(); QModelIndex copySample(); - QModelIndex pushSample(SampleItem*); + QModelIndex pushItem(SampleItem*); private: SamplesSet* set(); diff --git a/GUI/View/Views/SampleView.cpp b/GUI/View/Views/SampleView.cpp index b8197e3521c..ef644a87d1f 100644 --- a/GUI/View/Views/SampleView.cpp +++ b/GUI/View/Views/SampleView.cpp @@ -129,7 +129,7 @@ void SampleView::setToolbarActions(QToolBar* toolbar) toolbar->addAction(new_sample_action); connect(new_sample_action, &QAction::triggered, [this] { - m_qlistmodel->pushSample(new SampleItem); + m_qlistmodel->pushItem(new SampleItem); // TODO call new_item->addStandardMaterials() ?? }); @@ -142,7 +142,7 @@ void SampleView::setToolbarActions(QToolBar* toolbar) "Import sample from a Python script that contains a function that returns a multi-layer"); toolbar->addAction(import_sample_action); connect(import_sample_action, &QAction::triggered, - [this] { m_qlistmodel->pushSample(PyImportAssistant::importMultiLayer()); }); + [this] { m_qlistmodel->pushItem(PyImportAssistant::importMultiLayer()); }); #endif auto* choose_from_library_action = new QAction("Examples", this); @@ -166,7 +166,7 @@ void SampleView::setToolbarActions(QToolBar* toolbar) return; t->setName(title); t->setDescription(description); - m_qlistmodel->pushSample(t); + m_qlistmodel->pushItem(t); }); } -- GitLab