diff --git a/source/ArmarXGui/interface/WidgetDescription.ice b/source/ArmarXGui/interface/WidgetDescription.ice index c58420a9ef7efe4e621cf362d086a9ef3fd63b7a..58bb3b864c0b6ef00a583511614c412db83d8c0a 100644 --- a/source/ArmarXGui/interface/WidgetDescription.ice +++ b/source/ArmarXGui/interface/WidgetDescription.ice @@ -45,15 +45,15 @@ module armarx //Layouts class HBoxLayout extends Widget { - WidgetSeq widgets; + WidgetSeq children; }; class VBoxLayout extends Widget { - WidgetSeq widgets; + WidgetSeq children; }; class FormLayout extends Widget { - LabeledWidgetSeq widgets; + FormLayoutElementSeq children; }; //static elements class HSpacer extends Widget diff --git a/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.cpp b/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.cpp index b05b0baca9cdbb70282dd4a30fcb8b0faf6785dc..b22f2d2f0b209d225ca9fe523a2c3a2d6bc4499f 100644 --- a/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.cpp +++ b/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.cpp @@ -38,24 +38,24 @@ namespace armarx HBoxLayoutPtr makeHBoxLayout(std::vector<WidgetPtr> elements) { HBoxLayoutPtr w = new HBoxLayout; - w->widgets = std::move(elements); + w->children = std::move(elements); return w; } VBoxLayoutPtr makeVBoxLayout(std::vector<WidgetPtr> elements) { VBoxLayoutPtr w = new VBoxLayout; - w->widgets = std::move(elements); + w->children = std::move(elements); return w; } FormLayoutPtr makeFormLayout(std::vector<std::pair<std::string, WidgetPtr> > elements) { FormLayoutPtr l = new FormLayout; - l->widgets.reserve(elements.size()); + l->children.reserve(elements.size()); for (auto& elem : elements) { - l->widgets.emplace_back(makeLabeledWidget(std::move(elem.first), std::move(elem.second))); + l->children.emplace_back(makeFormLayoutElement(std::move(elem.first), std::move(elem.second))); } return l; } @@ -63,7 +63,7 @@ namespace armarx FormLayoutPtr makeFormLayout(std::vector<WidgetPtr> elements) { FormLayoutPtr l = new FormLayout; - l->widgets.reserve(elements.size()); + l->children.reserve(elements.size()); for (auto& elem : elements) { std::string name; @@ -71,7 +71,7 @@ namespace armarx { name = ConfigWidgetPtr::dynamicCast(elem)->name; } - l->widgets.emplace_back(makeLabeledWidget(std::move(name), std::move(elem))); + l->children.emplace_back(makeLabeledWidget(std::move(name), std::move(elem))); } return l; } diff --git a/source/ArmarXGui/libraries/WidgetDescription/WidgetDescription.cpp b/source/ArmarXGui/libraries/WidgetDescription/WidgetDescription.cpp index 48a02cf84612b36237e33c1ad3eddf56df1475c2..8306a9c1abe74ecc0aedcfd5e60fc7b85d02144a 100644 --- a/source/ArmarXGui/libraries/WidgetDescription/WidgetDescription.cpp +++ b/source/ArmarXGui/libraries/WidgetDescription/WidgetDescription.cpp @@ -68,7 +68,7 @@ namespace armarx ARMARX_CHECK_NOT_NULL(ptr); setLayout(new QVBoxLayout); layout()->setContentsMargins(0, 0, 0, 0); - for (const WidgetPtr& childPtr : ptr->widgets) + for (const WidgetPtr& childPtr : ptr->children) { layout()->addWidget(addChild(childPtr)); } @@ -87,7 +87,7 @@ namespace armarx ARMARX_CHECK_NOT_NULL(ptr); setLayout(new QHBoxLayout); layout()->setContentsMargins(0, 0, 0, 0); - for (const WidgetPtr& childPtr : ptr->widgets) + for (const WidgetPtr& childPtr : ptr->children) { layout()->addWidget(addChild(childPtr)); } @@ -106,7 +106,7 @@ namespace armarx auto l = new QFormLayout; setLayout(l); layout()->setContentsMargins(0, 0, 0, 0); - for (const LabeledWidgetPtr& labeledWidget : ptr->widgets) + for (const LabeledWidgetPtr& labeledWidget : ptr->children) { l->addRow(QString::fromStdString(child->label), addChild(child->child)); }