X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=9e4fcd0e35dd706baf15bb65e463a5e5e5bdb8da;hp=473e3d5f1a3ad36582a3d5c770d4793f607b6124;hb=eb8269e3b5eebdd77e6a82d42bcfdfbc3f7613a9;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 473e3d5f..9e4fcd0e 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -14,15 +14,14 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
+#include <cassert>
 
 #include <QComboBox>
 
-#include "enum.h"
+#include "enum.hpp"
 
 using std::pair;
 using std::vector;
@@ -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++) {