X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fstring.cpp;h=e7af45973cc92950aef95c8c4ba50d0357b8132b;hp=b8f3351cf8fb2acbc160a7bcd41bfb529443ddd3;hb=4c60462b00cc329e61daedd1c2e66724077bd412;hpb=b1fe148e0dce6e369c9d4770ca935a6a9ec94b59

diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp
index b8f3351c..e7af4597 100644
--- a/pv/prop/string.cpp
+++ b/pv/prop/string.cpp
@@ -20,12 +20,14 @@
 
 #include <assert.h>
 
+#include <QLineEdit>
 #include <QSpinBox>
 
-#include "string.h"
+#include "string.hpp"
 
-using namespace std;
-using namespace boost;
+using std::string;
+
+using Glib::ustring;
 
 namespace pv {
 namespace prop {
@@ -34,40 +36,44 @@ String::String(QString name,
 	Getter getter,
 	Setter setter) :
 	Property(name, getter, setter),
-	_line_edit(NULL)
+	line_edit_(nullptr)
 {
 }
 
 QWidget* String::get_widget(QWidget *parent, bool auto_commit)
 {
-	if (_line_edit)
-		return _line_edit;
+	if (line_edit_)
+		return line_edit_;
+
+	if (!getter_)
+		return nullptr;
+
+	Glib::VariantBase variant = getter_();
+	if (!variant.gobj())
+		return nullptr;
 
-	_line_edit = new QLineEdit(parent);
+	string value = Glib::VariantBase::cast_dynamic<Glib::Variant<ustring>>(
+		variant).get();
 
-	GVariant *const value = _getter ? _getter() : NULL;
-	if (value) {
-		_line_edit->setText(QString(
-			g_variant_get_string(value, NULL)));
-		g_variant_unref(value);
-	}
+	line_edit_ = new QLineEdit(parent);
+	line_edit_->setText(QString::fromStdString(value));
 
 	if (auto_commit)
-		connect(_line_edit, SIGNAL(textEdited(const QString&)),
+		connect(line_edit_, SIGNAL(textEdited(const QString&)),
 			this, SLOT(on_text_edited(const QString&)));
 
-	return _line_edit;
+	return line_edit_;
 }
 
 void String::commit()
 {
-	assert(_setter);
+	assert(setter_);
 
-	if (!_line_edit)
+	if (!line_edit_)
 		return;
 
-	QByteArray ba = _line_edit->text().toLocal8Bit();
-	_setter(g_variant_new_string(ba.data()));
+	QByteArray ba = line_edit_->text().toLocal8Bit();
+	setter_(Glib::Variant<ustring>::create(ba.data()));
 }
 
 void String::on_text_edited(const QString&)