X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=08fa54eea55a40392f5d32f73be5eccb9e02e0ec;hb=e71eb81c946c3524e01eaef9781ccbf170143d0c;hp=dad8f1edc6f106af051b82665b14350ab1542a08;hpb=f69678269730c1e0ee8319fba774a98043fec0e8;p=pulseview.git

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index dad8f1ed..08fa54ee 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -21,7 +21,7 @@
 #include <extdef.h>
 
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 #include <QApplication>
 #include <QFormLayout>
@@ -29,7 +29,7 @@
 #include <QLineEdit>
 #include <QMenu>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include "signal.hpp"
 #include "view.hpp"
@@ -63,7 +63,7 @@ Signal::Signal(pv::Session &session,
 	Trace(QString::fromUtf8(channel->name().c_str())),
 	session_(session),
 	channel_(channel),
-	name_widget_(NULL),
+	name_widget_(nullptr),
 	updating_name_widget_(false)
 {
 	assert(channel_);
@@ -101,15 +101,14 @@ shared_ptr<Channel> Signal::channel() const
 
 void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
-	int index;
-
 	name_widget_ = new QComboBox(parent);
 	name_widget_->setEditable(true);
+	name_widget_->setCompleter(0);
 
-	for(unsigned int i = 0; i < countof(ChannelNames); i++)
+	for (unsigned int i = 0; i < countof(ChannelNames); i++)
 		name_widget_->insertItem(i, ChannelNames[i]);
 
-	index = name_widget_->findText(name_, Qt::MatchExactly);
+	const int index = name_widget_->findText(name_, Qt::MatchExactly);
 
 	if (index == -1) {
 		name_widget_->insertItem(0, name_);