X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdialogs%2Fabout.cpp;h=693472ee92c4052b7210f22791bd40c212b9a044;hb=3d87310109576c77819c4c592d41bc1d9731978b;hp=8484e47b371062426620dd2d4e27befa8c7c2dc3;hpb=27e8df221014d1a8c7769866773e8dbb0486eea8;p=pulseview.git

diff --git a/pv/dialogs/about.cpp b/pv/dialogs/about.cpp
index 8484e47b..693472ee 100644
--- a/pv/dialogs/about.cpp
+++ b/pv/dialogs/about.cpp
@@ -18,31 +18,30 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifdef ENABLE_DECODE
 #include <libsigrokdecode/libsigrokdecode.h>
+#endif
 
 #include <QTextDocument>
 
-#include "about.h"
+#include "about.hpp"
 #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 <libsigrokcxx/libsigrokcxx.hpp>
 
+using std::shared_ptr;
+using sigrok::Context;
 
 namespace pv {
 namespace dialogs {
 
-About::About(QWidget *parent) :
+About::About(shared_ptr<Context> context, QWidget *parent) :
 	QDialog(parent),
 	ui(new Ui::About)
 {
-	struct sr_dev_driver **drivers;
-	struct sr_input_format **inputs;
-	struct sr_output_format **outputs;
-
+#ifdef ENABLE_DECODE
 	struct srd_decoder *dec;
+#endif
 
 	QString s;
 
@@ -62,33 +61,22 @@ About::About(QWidget *parent) :
 	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>")
-			 .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>");
-	inputs = sr_input_list();
-	for (int i = 0; inputs[i]; ++i) {
-		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)));
-	}
-
-	s.append("<tr><td colspan=\"2\"><b>" +
-		tr("Supported output formats:") +
-		"</b></td></tr>");
-	outputs = sr_output_list();
-	for (int i = 0; outputs[i]; ++i) {
+	for (auto entry : context->input_formats()) {
 		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
-			.arg(QString::fromUtf8(outputs[i]->id))
-			.arg(QString::fromUtf8(outputs[i]->description)));
+			 .arg(QString::fromUtf8(entry.first.c_str()))
+			 .arg(QString::fromUtf8(entry.second->description().c_str())));
 	}
 
+#ifdef ENABLE_DECODE
 	s.append("<tr><td colspan=\"2\"><b>" +
 		tr("Supported protocol decoders:") +
 		"</b></td></tr>");
@@ -98,6 +86,7 @@ About::About(QWidget *parent) :
 			 .arg(QString::fromUtf8(dec->id))
 			 .arg(QString::fromUtf8(dec->longname)));
 	}
+#endif
 
 	s.append("</table>");