LogicSignal: Removed redundant calls to match_action

[pulseview.git] / pv / view / logicsignal.cpp

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 1b873e24fd797cb9addb787a6043144b9300e568..e33c197a7be7ce31696c0465b82dd9cd4794f5c3 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -28,14 +28,14 @@
 #include <QFormLayout>
 #include <QToolBar>
 
-#include "logicsignal.h"
-#include "view.h"
+#include "logicsignal.hpp"
+#include "view.hpp"
 
-#include <pv/sigsession.h>
-#include <pv/devicemanager.h>
-#include <pv/data/logic.h>
-#include <pv/data/logicsnapshot.h>
-#include <pv/view/view.h>
+#include <pv/sigsession.hpp>
+#include <pv/devicemanager.hpp>
+#include <pv/data/logic.hpp>
+#include <pv/data/logicsnapshot.hpp>
+#include <pv/view/view.hpp>
 
 #include <libsigrok/libsigrok.hpp>
 
@@ -82,7 +82,7 @@ const QColor LogicSignal::SignalColours[10] = {
 };
 
 LogicSignal::LogicSignal(
-       pv::SigSession &session,
+       pv::Session &session,
        shared_ptr<Device> device,
        shared_ptr<Channel> channel,
        shared_ptr<data::Logic> data) :
@@ -339,9 +339,11 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
                Glib::VariantBase::cast_dynamic<Glib::Variant<vector<int32_t>>>(
                        gvar).get();
        for (auto type_id : trig_types) {
-               auto type = TriggerMatchType::get(type_id);
-               trigger_bar_->addAction(match_action(type));
-               match_action(type)->setChecked(trigger_match_ == type);
+               const TriggerMatchType *const type =
+                       TriggerMatchType::get(type_id);
+               QAction *const action = match_action(type);
+               trigger_bar_->addAction(action);
+               action->setChecked(trigger_match_ == type);
        }
        form->addRow(tr("Trigger"), trigger_bar_);