X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=06e4d76f1098e5f6967b57eeee81ba591d72de45;hb=4c60462b00cc329e61daedd1c2e66724077bd412;hp=473e3d5f1a3ad36582a3d5c770d4793f607b6124;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;p=pulseview.git diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp index 473e3d5..06e4d76 100644 --- a/pv/prop/enum.cpp +++ b/pv/prop/enum.cpp @@ -22,7 +22,7 @@ #include -#include "enum.h" +#include "enum.hpp" using std::pair; using std::vector; @@ -35,7 +35,7 @@ Enum::Enum(QString name, Getter getter, Setter setter) : Property(name, getter, setter), values_(values), - selector_(NULL) + selector_(nullptr) { } @@ -49,11 +49,11 @@ QWidget* Enum::get_widget(QWidget *parent, bool auto_commit) return selector_; if (!getter_) - return NULL; + return nullptr; Glib::VariantBase variant = getter_(); if (!variant.gobj()) - return NULL; + return nullptr; selector_ = new QComboBox(parent); for (unsigned int i = 0; i < values_.size(); i++) {