Skip to content
Snippets Groups Projects
Commit 46d18fe5 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

inline fct setBaseItem

parent ec104e03
No related branches found
No related tags found
1 merge request!2011replace two templated classes
...@@ -47,15 +47,6 @@ void ItemComboWidget::registerWidget(const QString& presentationType, factory_fu ...@@ -47,15 +47,6 @@ void ItemComboWidget::registerWidget(const QString& presentationType, factory_fu
m_widgetFactory.registerItem(presentationType, f); 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 //! Sets stack to show widget corresponding to given presentation
void ItemComboWidget::setPresentation(const QString& presentationType) void ItemComboWidget::setPresentation(const QString& presentationType)
{ {
...@@ -102,7 +93,12 @@ void ItemComboWidget::setJobOrRealItem(QObject* job_or_real_item) ...@@ -102,7 +93,12 @@ void ItemComboWidget::setJobOrRealItem(QObject* job_or_real_item)
return; 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()); setToolbarVisible(!itemPresentation().isEmpty());
m_toolbar->setPresentationList(presentationList(), activePresentationList()); m_toolbar->setPresentationList(presentationList(), activePresentationList());
setPresentation(itemPresentation()); setPresentation(itemPresentation());
......
...@@ -46,7 +46,6 @@ public: ...@@ -46,7 +46,6 @@ public:
void setToolbarVisible(bool value); void setToolbarVisible(bool value);
void setBaseItem(QObject* item);
void setJobOrRealItem(QObject* job_or_real_item); void setJobOrRealItem(QObject* job_or_real_item);
JobItem* jobItem() const; JobItem* jobItem() const;
RealItem* realItem() const; RealItem* realItem() const;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment