X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=1896bba2c4a177ca26af309b005793be6dbbfc03;hb=4c60462b00cc329e61daedd1c2e66724077bd412;hp=afd9ca7413f4a8b426dc3f6a3a17970f6723fbdf;hpb=fae4a2e674ddec22ba68b15fad1eb0bd8b151967;p=pulseview.git

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index afd9ca7..1896bba 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"
@@ -60,10 +60,10 @@ const char *const ChannelNames[] = {
 
 Signal::Signal(pv::Session &session,
 	std::shared_ptr<sigrok::Channel> channel) :
-	Trace(channel->name().c_str()),
+	Trace(QString::fromUtf8(channel->name().c_str())),
 	session_(session),
 	channel_(channel),
-	name_widget_(NULL),
+	name_widget_(nullptr),
 	updating_name_widget_(false)
 {
 	assert(channel_);
@@ -78,7 +78,7 @@ void Signal::set_name(QString name)
 
 	// Store the channel name in sigrok::Channel so that it
 	// will end up in the .sr file upon save.
-	channel_->set_name(name.toStdString());
+	channel_->set_name(name.toUtf8().constData());
 }
 
 bool Signal::enabled() const