X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=e214ec78426c505d621808fb38e9e5f34dc65462;hp=262434d1d845793b2e02d70fd923773be068d9cd;hb=b86aa8f4a22857a90bbfca6e7993b2deaf1157d4;hpb=ece37fe8b1d44f4f292fcae0ec838422cf2a6ad3

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 262434d1..e214ec78 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -72,10 +72,12 @@ const QColor LogicSignal::SignalColours[10] = {
 	QColor(0xEE, 0xEE, 0xEC),	// White
 };
 
-LogicSignal::LogicSignal(shared_ptr<Device> device,
-		shared_ptr<Channel> channel,
-		shared_ptr<data::Logic> data) :
-	Signal(channel),
+LogicSignal::LogicSignal(
+	pv::SigSession &session,
+	shared_ptr<Device> device,
+	shared_ptr<Channel> channel,
+	shared_ptr<data::Logic> data) :
+	Signal(session, channel),
 	_device(device),
 	_data(data),
 	_trigger_none(NULL),
@@ -301,7 +303,6 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
 	Glib::VariantContainerBase gvar;
 	vector<int32_t> trig_types;
-	bool is_checked;
 
 	Signal::populate_popup_form(parent, form);
 
@@ -320,8 +321,7 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	for (auto type_id : trig_types) {
 		auto type = TriggerMatchType::get(type_id);
 		_trigger_bar->addAction(match_action(type));
-		is_checked = _trigger_match == type;
-		match_action(type)->setChecked(is_checked);
+		match_action(type)->setChecked(_trigger_match == type);
 	}
 	form->addRow(tr("Trigger"), _trigger_bar);
 
@@ -331,10 +331,10 @@ void LogicSignal::on_trigger()
 {
 	QAction *action;
 
-	match_action(_trigger_match)->setChecked(FALSE);
+	match_action(_trigger_match)->setChecked(false);
 
 	action = (QAction *)sender();
-	action->setChecked(TRUE);
+	action->setChecked(true);
 	_trigger_match = action_match(action);
 
 }