X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=c3388581f2c402426e62a0281d61d809fa899eec;hp=bffd0dfefbb15e6182b6c4ed54ee5ae9ac3dbd27;hb=d9ea96280ab1128427143660ae375c30b19aa0cb;hpb=35750e4dc619d538f105ed024f3a72b630108234

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index bffd0dfe..c3388581 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -86,14 +86,12 @@ Channels::Channels(Session &session, QWidget *parent) :
 		signal_map[sig->channel()] = sig;
 
 	// Populate channel groups
-	for (auto entry : device->channel_groups())
-	{
+	for (auto entry : device->channel_groups()) {
 		shared_ptr<ChannelGroup> group = entry.second;
 		// Make a set of signals, and removed this signals from the
 		// signal map.
 		vector< shared_ptr<Signal> > group_sigs;
-		for (auto channel : group->channels())
-		{
+		for (auto channel : group->channels()) {
 			const auto iter = signal_map.find(channel);
 
 			if (iter == signal_map.end())
@@ -108,8 +106,7 @@ Channels::Channels(Session &session, QWidget *parent) :
 
 	// Make a vector of the remaining channels
 	vector< shared_ptr<Signal> > global_sigs;
-	for (auto channel : device->channels())
-	{
+	for (auto channel : device->channels()) {
 		const map<shared_ptr<Channel>, shared_ptr<Signal> >::
 			const_iterator iter = signal_map.find(channel);
 		if (iter != signal_map.end())
@@ -144,9 +141,8 @@ void Channels::set_all_channels(bool set)
 	updating_channels_ = true;
 
 	for (map<QCheckBox*, shared_ptr<Signal> >::const_iterator i =
-		check_box_signal_map_.begin();
-		i != check_box_signal_map_.end(); i++)
-	{
+			check_box_signal_map_.begin();
+			i != check_box_signal_map_.end(); i++) {
 		const shared_ptr<Signal> sig = (*i).second;
 		assert(sig);
 
@@ -194,8 +190,7 @@ QGridLayout* Channels::create_channel_group_grid(
 	int row = 0, col = 0;
 	QGridLayout *const grid = new QGridLayout();
 
-	for (const shared_ptr<pv::view::Signal>& sig : sigs)
-	{
+	for (const shared_ptr<pv::view::Signal>& sig : sigs) {
 		assert(sig);
 
 		QCheckBox *const checkbox = new QCheckBox(sig->name());
@@ -214,16 +209,15 @@ QGridLayout* Channels::create_channel_group_grid(
 	return grid;
 }
 
-void Channels::showEvent(QShowEvent *e)
+void Channels::showEvent(QShowEvent *event)
 {
-	pv::widgets::Popup::showEvent(e);
+	pv::widgets::Popup::showEvent(event);
 
 	updating_channels_ = true;
 
 	for (map<QCheckBox*, shared_ptr<Signal> >::const_iterator i =
-		check_box_signal_map_.begin();
-		i != check_box_signal_map_.end(); i++)
-	{
+			check_box_signal_map_.begin();
+			i != check_box_signal_map_.end(); i++) {
 		const shared_ptr<Signal> sig = (*i).second;
 		assert(sig);