From 46d18fe51f300b6b65e37948cd3b31d381b25800 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 12 Oct 2023 13:45:47 +0200
Subject: [PATCH] inline fct setBaseItem
---
GUI/View/Widget/ItemComboWidget.cpp | 16 ++++++----------
GUI/View/Widget/ItemComboWidget.h | 1 -
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/GUI/View/Widget/ItemComboWidget.cpp b/GUI/View/Widget/ItemComboWidget.cpp
index 3ed74933365..bb0d7917657 100644
--- a/GUI/View/Widget/ItemComboWidget.cpp
+++ b/GUI/View/Widget/ItemComboWidget.cpp
@@ -47,15 +47,6 @@ void ItemComboWidget::registerWidget(const QString& presentationType, factory_fu
m_widgetFactory.registerItem(presentationType, f);
}
-void ItemComboWidget::setBaseItem(QObject* item)
-{
- m_item = item;
- ASSERT(jobItem() || realItem());
-
- disconnect(m_item, &QObject::destroyed, this, nullptr);
- connect(m_item, &QObject::destroyed, this, [this]() { m_item = nullptr; });
-}
-
//! Sets stack to show widget corresponding to given presentation
void ItemComboWidget::setPresentation(const QString& presentationType)
{
@@ -102,7 +93,12 @@ void ItemComboWidget::setJobOrRealItem(QObject* job_or_real_item)
return;
}
- setBaseItem(job_or_real_item);
+ m_item = job_or_real_item;
+ ASSERT(jobItem() || realItem());
+
+ disconnect(m_item, &QObject::destroyed, this, nullptr);
+ connect(m_item, &QObject::destroyed, this, [this]() { m_item = nullptr; });
+
setToolbarVisible(!itemPresentation().isEmpty());
m_toolbar->setPresentationList(presentationList(), activePresentationList());
setPresentation(itemPresentation());
diff --git a/GUI/View/Widget/ItemComboWidget.h b/GUI/View/Widget/ItemComboWidget.h
index 18011019811..876dfecc414 100644
--- a/GUI/View/Widget/ItemComboWidget.h
+++ b/GUI/View/Widget/ItemComboWidget.h
@@ -46,7 +46,6 @@ public:
void setToolbarVisible(bool value);
- void setBaseItem(QObject* item);
void setJobOrRealItem(QObject* job_or_real_item);
JobItem* jobItem() const;
RealItem* realItem() const;
--
GitLab