X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=f762bd1a8ab83e56a1d8f2e9d3e733e54d9dc573;hb=8a017a8bbc52e19c4d83362dbf58eb7ae447fd8b;hp=1694840a1c7a69357e860bbe047e4af2b681f4fe;hpb=24bb0bd140f7f8b00ea3c0cbe0c5d26dc03a3b69;p=pulseview.git diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp index 1694840..f762bd1 100644 --- a/pv/prop/enum.cpp +++ b/pv/prop/enum.cpp @@ -24,15 +24,16 @@ #include "enum.h" +using namespace boost; using namespace std; namespace pv { namespace prop { Enum::Enum(QString name, - std::vector > values, - boost::function getter, - boost::function setter) : + vector > values, + function getter, + function setter) : Property(name), _values(values), _getter(getter), @@ -43,11 +44,11 @@ Enum::Enum(QString name, QWidget* Enum::get_widget(QWidget *parent) { - if(_selector) + if (_selector) return _selector; _selector = new QComboBox(parent); - for(vector< pair >::const_iterator i = + for (vector< pair >::const_iterator i = _values.begin(); i != _values.end(); i++) _selector->addItem((*i).second, @@ -60,7 +61,7 @@ void Enum::commit() { assert(_setter); - if(!_selector) + if (!_selector) return; const int index = _selector->currentIndex();