projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewItem: Added rect parameter to point()
[pulseview.git]
/
pv
/
dialogs
/
about.cpp
diff --git
a/pv/dialogs/about.cpp
b/pv/dialogs/about.cpp
index c4827962c59afda9891b62a99cd2268ae8c44234..5517beb3225273330c66214e40dc115aba62f110 100644
(file)
--- a/
pv/dialogs/about.cpp
+++ b/
pv/dialogs/about.cpp
@@
-24,25
+24,21
@@
#include <QTextDocument>
#include <QTextDocument>
-#include "about.h"
+#include "about.h
pp
"
#include <ui_about.h>
#include <ui_about.h>
-/* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
-#define __STDC_FORMAT_MACROS
-#include <glib.h>
-#include <libsigrok/libsigrok.h>
+#include <libsigrok/libsigrok.hpp>
+using std::shared_ptr;
+using sigrok::Context;
namespace pv {
namespace dialogs {
namespace pv {
namespace dialogs {
-About::About(QWidget *parent) :
+About::About(
shared_ptr<Context> context,
QWidget *parent) :
QDialog(parent),
ui(new Ui::About)
{
QDialog(parent),
ui(new Ui::About)
{
- struct sr_dev_driver **drivers;
- struct sr_input_format **inputs;
-
#ifdef ENABLE_DECODE
struct srd_decoder *dec;
#endif
#ifdef ENABLE_DECODE
struct srd_decoder *dec;
#endif
@@
-65,21
+61,19
@@
About::About(QWidget *parent) :
s.append("<tr><td colspan=\"2\"><b>" +
tr("Supported hardware drivers:") +
"</b></td></tr>");
s.append("<tr><td colspan=\"2\"><b>" +
tr("Supported hardware drivers:") +
"</b></td></tr>");
- drivers = sr_driver_list();
- for (int i = 0; drivers[i]; ++i) {
+ for (auto entry : context->drivers()) {
s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
- .arg(QString::fromUtf8(
drivers[i]->name
))
- .arg(QString::fromUtf8(
drivers[i]->longname
)));
+ .arg(QString::fromUtf8(
entry.first.c_str()
))
+ .arg(QString::fromUtf8(
entry.second->long_name().c_str()
)));
}
s.append("<tr><td colspan=\"2\"><b>" +
tr("Supported input formats:") +
"</b></td></tr>");
}
s.append("<tr><td colspan=\"2\"><b>" +
tr("Supported input formats:") +
"</b></td></tr>");
- inputs = sr_input_list();
- for (int i = 0; inputs[i]; ++i) {
+ for (auto entry : context->input_formats()) {
s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
- .arg(QString::fromUtf8(
inputs[i]->id
))
- .arg(QString::fromUtf8(
inputs[i]->description
)));
+ .arg(QString::fromUtf8(
entry.first.c_str()
))
+ .arg(QString::fromUtf8(
entry.second->description().c_str()
)));
}
#ifdef ENABLE_DECODE
}
#ifdef ENABLE_DECODE