Reduce include bloat by including boost/thread/{locks,shared_mutex}.hpp directly

[pulseview.git] / pv / popups / channels.cpp

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index 3d209e84bb15a9350cc7445966c15fbde81f3b08..3cf2ff40ae2591333519367bb03b9cc6e70a3a95 100644 (file)
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -20,6 +20,9 @@
 
 #include <map>
 
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
+
 #include <QCheckBox>
 #include <QFormLayout>
 #include <QGridLayout>
@@ -28,6 +31,7 @@
 #include "channels.hpp"
 
 #include <pv/binding/device.hpp>
+#include <pv/devices/device.hpp>
 #include <pv/session.hpp>
 #include <pv/view/signal.hpp>
 
@@ -65,7 +69,7 @@ Channels::Channels(Session &session, QWidget *parent) :
        // Create the layout
        setLayout(&layout_);
 
-       shared_ptr<sigrok::Device> device = session_.device();
+       const shared_ptr<sigrok::Device> device = session_.device()->device();
        assert(device);
 
        // Collect a set of signals
@@ -109,7 +113,7 @@ Channels::Channels(Session &session, QWidget *parent) :
        }
 
        // Create a group
-       populate_group(NULL, global_sigs);
+       populate_group(nullptr, global_sigs);
 
        // Create the enable/disable all buttons
        connect(&enable_all_channels_, SIGNAL(clicked()),
@@ -199,7 +203,7 @@ QGridLayout* Channels::create_channel_group_grid(
 
                check_box_signal_map_[checkbox] = sig;
 
-               if(++col >= 8)
+               if (++col >= 8)
                        col = 0, row++;
        }