* 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>
using std::mutex;
using std::set;
using std::shared_ptr;
+using std::make_shared;
using std::unordered_set;
using std::vector;
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;
// 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())) &&