X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=9f97d5bca7194562f40d4939b77e47f46e19502b;hb=793208c83a8bde80be063a7bcb159ee7ffae2b9f;hp=7348d25b2d44bea1d974d05bda84d181102dfdbf;hpb=d9e717371c60f8c5ace007619da1b041f4db4e25;p=pulseview.git

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 7348d25b..9f97d5bc 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -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++)
 		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_);