- if (_selector)
- return _selector;
-
- const void *value = NULL;
- if (_getter)
- value = _getter();
-
- _selector = new QComboBox(parent);
- for (unsigned int i = 0; i < _values.size(); i++) {
- const pair<const void*, QString> &v = _values[i];
- _selector->addItem(v.second,
- qVariantFromValue((void*)v.first));
- if (v.first == value)
- _selector->setCurrentIndex(i);
+ if (selector_)
+ return selector_;
+
+ if (!getter_)
+ return nullptr;
+
+ Glib::VariantBase variant = getter_();
+ if (!variant.gobj())
+ return nullptr;
+
+ selector_ = new QComboBox(parent);
+ for (unsigned int i = 0; i < values_.size(); i++) {
+ const pair<Glib::VariantBase, QString> &v = values_[i];
+ selector_->addItem(v.second, qVariantFromValue(v.first));
+ if (v.first.equal(variant))
+ selector_->setCurrentIndex(i);