#include <libsigrok/libsigrok.h>
}
-using namespace std;
+using std::list;
+using std::string;
extern sr_context *sr_ctx;
* and sensors.
*/
bool supported_device = false;
- if ((sr_config_list(drivers[i], SR_CONF_DEVICE_OPTIONS,
- &gvar_opts, NULL) == SR_OK)) {
+ if ((sr_config_list(drivers[i], NULL, NULL,
+ SR_CONF_DEVICE_OPTIONS, &gvar_opts) == SR_OK)) {
hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_opts,
&num_opts, sizeof(int32_t));
for (unsigned int j = 0; j < num_opts; j++)
BOOST_FOREACH(sr_dev_inst *const sdi, devices)
{
const string title = DeviceManager::format_device_title(sdi);
- QString text(title.c_str());
+ QString text = QString::fromUtf8(title.c_str());
if (sdi->probes) {
text += QString(" with %1 probes").arg(
g_slist_length(sdi->probes));
}
_device_list.setCurrentRow(0);
- _button_box.button(QDialogButtonBox::Ok)->setDisabled(false);
+ _button_box.button(QDialogButtonBox::Ok)->setDisabled(_device_list.count() == 0);
}
void Connect::device_selected(int index)
unset_connection();
- if ((sr_config_list(driver, SR_CONF_SCAN_OPTIONS,
- &gvar_list, NULL) == SR_OK)) {
+ if ((sr_config_list(driver, NULL, NULL,
+ SR_CONF_SCAN_OPTIONS, &gvar_list) == SR_OK)) {
hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_list,
&num_opts, sizeof(int32_t));