X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=729b0b4c1588ff6ae93cc5c152dbdcd2e46994cc;hb=75663e3ab6656ed9fc39050d8ac6752450b6a4ad;hp=a96b0327e0e6ffd6f5364876b928ebaa87077daf;hpb=7708eb92ca87836f5d4987899e0fbb7a4e2335b4;p=pulseview.git

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index a96b0327..729b0b4c 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -21,7 +21,7 @@
 #include <extdef.h>
 
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 #include <QApplication>
 #include <QFormLayout>
@@ -43,8 +43,8 @@ const int Trace::LabelHitPadding = 2;
 
 Trace::Trace(QString name) :
 	name_(name),
-	popup_(NULL),
-	popup_form_(NULL)
+	popup_(nullptr),
+	popup_form_(nullptr)
 {
 }
 
@@ -219,8 +219,8 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 void Trace::on_popup_closed()
 {
-	popup_ = NULL;
-	popup_form_ = NULL;
+	popup_ = nullptr;
+	popup_form_ = nullptr;
 }
 
 void Trace::on_text_changed(const QString &text)