diff --git a/src/libs/utils/layoutbuilder.cpp b/src/libs/utils/layoutbuilder.cpp index e285ed98f6c..8d087ff495e 100644 --- a/src/libs/utils/layoutbuilder.cpp +++ b/src/libs/utils/layoutbuilder.cpp @@ -232,10 +232,21 @@ LayoutItem::LayoutItem() = default; LayoutItem::~LayoutItem() = default; +LayoutItem::LayoutItem(QLayout *l) + : layout(l), empty(!l) +{} + +LayoutItem::LayoutItem(QWidget *w) + : widget(w), empty(!w) +{} + +LayoutItem::LayoutItem(const QString &t) + : text(t), empty(t.isEmpty()) +{} + LayoutItem::LayoutItem(const LayoutModifier &inner) -{ - ownerModifier = inner; -} + : empty(!inner), ownerModifier(inner) +{} /*! \fn template LayoutItem(const T &t) @@ -428,31 +439,23 @@ void addToWidget(Widget *widget, const Layout &layout) void addToLayout(Layout *layout, const Widget &inner) { - LayoutItem item; - item.widget = access(&inner); - layout->addLayoutItem(item); + layout->addLayoutItem(access(&inner)); } void addToLayout(Layout *layout, QWidget *inner) { - LayoutItem item; - item.widget = inner; - layout->addLayoutItem(item); + layout->addLayoutItem(inner); } void addToLayout(Layout *layout, QLayout *inner) { - LayoutItem item; - item.layout = inner; - layout->addLayoutItem(item); + layout->addLayoutItem(inner); } void addToLayout(Layout *layout, const Layout &inner) { inner.flush_(); - LayoutItem item; - item.layout = access(&inner); - layout->addLayoutItem(item); + layout->addLayoutItem(access(&inner)); } void addToLayout(Layout *layout, const LayoutModifier &inner) @@ -462,9 +465,7 @@ void addToLayout(Layout *layout, const LayoutModifier &inner) void addToLayout(Layout *layout, const QString &inner) { - LayoutItem item; - item.text = inner; - layout->addLayoutItem(item); + layout->addLayoutItem(inner); } void empty(Layout *layout) diff --git a/src/libs/utils/layoutbuilder.h b/src/libs/utils/layoutbuilder.h index c62623f2769..130a4e632dc 100644 --- a/src/libs/utils/layoutbuilder.h +++ b/src/libs/utils/layoutbuilder.h @@ -149,9 +149,9 @@ class QTCREATOR_UTILS_EXPORT LayoutItem public: ~LayoutItem(); LayoutItem(); - LayoutItem(QLayout *l) : layout(l) {} - LayoutItem(QWidget *w) : widget(w) {} - LayoutItem(const QString &t) : text(t) {} + LayoutItem(QLayout *l); + LayoutItem(QWidget *w); + LayoutItem(const QString &t); LayoutItem(const LayoutModifier &inner); QString text;