X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=71cd431548da771ff5e3a9289480f62c5d5b71d2;hb=1e5faac3a34145620fedf7344c442d9e0a4e2296;hp=412a31b0827854d01d103d5f110325b7717faaad;hpb=b1fe148e0dce6e369c9d4770ca935a6a9ec94b59;p=pulseview.git

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 412a31b..71cd431 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -24,8 +24,8 @@
 
 #include "enum.h"
 
-using namespace boost;
-using namespace std;
+using std::pair;
+using std::vector;
 
 namespace pv {
 namespace prop {
@@ -41,8 +41,9 @@ Enum::Enum(QString name,
 
 Enum::~Enum()
 {
-	for (unsigned int i = 0; i < _values.size(); i++)
-		g_variant_unref(_values[i].first);
+	for (vector< pair<GVariant*, QString> >::const_iterator i =
+		_values.begin(); i != _values.end(); i++)
+		g_variant_unref((*i).first);
 }
 
 QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
@@ -51,6 +52,8 @@ QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
 		return _selector;
 
 	GVariant *const value = _getter ? _getter() : NULL;
+	if (!value)
+		return NULL;
 
 	_selector = new QComboBox(parent);
 	for (unsigned int i = 0; i < _values.size(); i++) {