X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=a4c542af55fb9f05caaccd5043b0d7b098bbdaf2;hp=6717101b9288f51d66f0c294a95def76590a14f0;hb=09f55d9665efb3b17ba7de4bae47be6989e884fe;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329 diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp index 6717101b..a4c542af 100644 --- a/pv/prop/enum.cpp +++ b/pv/prop/enum.cpp @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ #include @@ -35,11 +34,7 @@ Enum::Enum(QString name, Getter getter, Setter setter) : Property(name, getter, setter), values_(values), - selector_(NULL) -{ -} - -Enum::~Enum() + selector_(nullptr) { } @@ -49,11 +44,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++) {