Random simplifications, cosmetics/whitespace/consistency fixes.

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

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index 7489b93f81b832d0f8bb64586155c75b7502556c..4a5e396c2e08e685d81205caa642608d3be73a13 100644 (file)
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <map>
@@ -25,8 +24,6 @@
 #define NOGDI
 #define NORESOURCE
 #endif
-#include <boost/thread/locks.hpp>
-#include <boost/thread/shared_mutex.hpp>
 
 #include <QCheckBox>
 #include <QFormLayout>
@@ -45,13 +42,9 @@
 
 using namespace Qt;
 
-using boost::shared_lock;
-using boost::shared_mutex;
-using std::lock_guard;
 using std::map;
-using std::mutex;
-using std::set;
 using std::shared_ptr;
+using std::make_shared;
 using std::unordered_set;
 using std::vector;
 
@@ -82,8 +75,8 @@ Channels::Channels(Session &session, QWidget *parent) :
        map<shared_ptr<Channel>, shared_ptr<SignalBase> > signal_map;
 
        unordered_set< shared_ptr<SignalBase> > sigs;
-       for (const shared_ptr<view::Signal> s : session_.signals())
-               sigs.insert(s->channel());
+       for (const shared_ptr<data::SignalBase> b : session_.signalbases())
+               sigs.insert(b);
 
        for (const shared_ptr<SignalBase> &sig : sigs)
                signal_map[sig->channel()] = sig;
@@ -166,7 +159,7 @@ void Channels::populate_group(shared_ptr<ChannelGroup> group,
        // popup.
        shared_ptr<Device> binding;
        if (group)
-               binding = shared_ptr<Device>(new Device(group));
+               binding = make_shared<Device>(group);
 
        // Create a title if the group is going to have any content
        if ((!sigs.empty() || (binding && !binding->properties().empty())) &&
@@ -175,13 +168,11 @@ void Channels::populate_group(shared_ptr<ChannelGroup> group,
                        QString("<h3>%1</h3>").arg(group->name().c_str())));
 
        // Create the channel group grid
-       QGridLayout *const channel_grid =
-               create_channel_group_grid(sigs);
+       QGridLayout *const channel_grid = create_channel_group_grid(sigs);
        layout_.addRow(channel_grid);
 
        // Create the channel group options
-       if (binding)
-       {
+       if (binding) {
                binding->add_properties_to_form(&layout_, true);
                group_bindings_.push_back(binding);
        }