projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nsis: Mention firmware files and PDs in the description.
[pulseview.git]
/
pv
/
dialogs
/
connect.cpp
diff --git
a/pv/dialogs/connect.cpp
b/pv/dialogs/connect.cpp
index f8fbe67f79bb1bf2260f7e3749e0044c2b139abd..52530beb5d391815233f8a11140bde1c2d5ad20b 100644
(file)
--- a/
pv/dialogs/connect.cpp
+++ b/
pv/dialogs/connect.cpp
@@
-31,7
+31,8
@@
extern "C" {
#include <libsigrok/libsigrok.h>
}
#include <libsigrok/libsigrok.h>
}
-using namespace std;
+using std::list;
+using std::string;
extern sr_context *sr_ctx;
extern sr_context *sr_ctx;
@@
-163,7
+164,7
@@
void Connect::scan_pressed()
BOOST_FOREACH(sr_dev_inst *const sdi, devices)
{
const string title = DeviceManager::format_device_title(sdi);
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));
if (sdi->probes) {
text += QString(" with %1 probes").arg(
g_slist_length(sdi->probes));