using std::list;
using std::map;
+using std::pair;
using std::shared_ptr;
using std::string;
settings.setValue("geometry", saveGeometry());
settings.endGroup();
- if (_session.get_device()) {
+ if (_session.device()) {
settings.beginGroup("Device");
key_list.push_back("vendor");
key_list.push_back("model");
key_list.push_back("connection_id");
dev_info = _device_manager.get_device_info(
- _session.get_device());
+ _session.device());
for (string key : key_list) {
{
assert(_sampling_bar);
- shared_ptr<Device> selected_device = _session.get_device();
+ shared_ptr<Device> selected_device = _session.device();
list< shared_ptr<Device> > devices;
if (_device_manager.devices().size() == 0)
devices.push_back(selected_device);
assert(selected_device);
- map<shared_ptr<Device>, string> device_names;
+ list< pair< shared_ptr<Device>, string> > device_list;
for (auto device : devices)
- device_names[device] = _device_manager.get_display_name(device);
+ device_list.push_back(make_pair(
+ device, _device_manager.get_display_name(device)));
- _sampling_bar->set_device_list(device_names, selected_device);
+ _sampling_bar->set_device_list(device_list, selected_device);
}
void MainWindow::closeEvent(QCloseEvent *event)