projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #599 by supplying correct length to create_logic_packet()
[pulseview.git]
/
pv
/
prop
/
string.cpp
diff --git
a/pv/prop/string.cpp
b/pv/prop/string.cpp
index ebad62ba03510f8b8213c272b17d6cf462b77c51..e7af45973cc92950aef95c8c4ba50d0357b8132b 100644
(file)
--- a/
pv/prop/string.cpp
+++ b/
pv/prop/string.cpp
@@
-23,7
+23,7
@@
#include <QLineEdit>
#include <QSpinBox>
#include <QLineEdit>
#include <QSpinBox>
-#include "string.h"
+#include "string.h
pp
"
using std::string;
using std::string;
@@
-36,7
+36,7
@@
String::String(QString name,
Getter getter,
Setter setter) :
Property(name, getter, setter),
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 line_edit_;
if (!getter_)
- return
NULL
;
+ return
nullptr
;
Glib::VariantBase variant = getter_();
if (!variant.gobj())
Glib::VariantBase variant = getter_();
if (!variant.gobj())
- return
NULL
;
+ return
nullptr
;
string value = Glib::VariantBase::cast_dynamic<Glib::Variant<ustring>>(
variant).get();
string value = Glib::VariantBase::cast_dynamic<Glib::Variant<ustring>>(
variant).get();