X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=9c200b9db31eb5d1c6a3e35cafcc85b1ec2cdbbf;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hp=f8f94d1a4273534d09fbf9a2bb6766db518810c7;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da;p=pulseview.git

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index f8f94d1..9c200b9 100644
--- 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>
@@ -52,6 +51,7 @@ 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 +82,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->base());
+	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 +166,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())) &&