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

diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp
index ebad62ba..e7af4597 100644
--- a/pv/prop/string.cpp
+++ b/pv/prop/string.cpp
@@ -23,7 +23,7 @@
 #include <QLineEdit>
 #include <QSpinBox>
 
-#include "string.h"
+#include "string.hpp"
 
 using std::string;
 
@@ -36,7 +36,7 @@ String::String(QString name,
 	Getter getter,
 	Setter setter) :
 	Property(name, getter, setter),
-	line_edit_(NULL)
+	line_edit_(nullptr)
 {
 }
 
@@ -46,11 +46,11 @@ QWidget* String::get_widget(QWidget *parent, bool auto_commit)
 		return line_edit_;
 
 	if (!getter_)
-		return NULL;
+		return nullptr;
 
 	Glib::VariantBase variant = getter_();
 	if (!variant.gobj())
-		return NULL;
+		return nullptr;
 
 	string value = Glib::VariantBase::cast_dynamic<Glib::Variant<ustring>>(
 		variant).get();