Make sigrokdecode a non-optional dependancy

[pulseview.git] / pv / dialogs / about.cpp

diff --git a/pv/dialogs/about.cpp b/pv/dialogs/about.cpp
index a7778549b3438c47ab493bcb00f2516a5f9b6fae..806dc4c5c057c6ee2bafa76e1700039230b18367 100644 (file)
--- a/pv/dialogs/about.cpp
+++ b/pv/dialogs/about.cpp
@@ -18,21 +18,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern "C" {
-#include <sigrokdecode.h>
-}
+#include <libsigrokdecode/libsigrokdecode.h>
 
 #include <QTextDocument>
 
 #include "about.h"
 #include <ui_about.h>
 
-extern "C" {
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
 #define __STDC_FORMAT_MACROS
 #include <glib.h>
 #include <libsigrok/libsigrok.h>
-}
+
 
 namespace pv {
 namespace dialogs {
@@ -41,11 +38,12 @@ About::About(QWidget *parent) :
        QDialog(parent),
        ui(new Ui::About)
 {
-       GSList *l;
        struct sr_dev_driver **drivers;
        struct sr_input_format **inputs;
        struct sr_output_format **outputs;
+
        struct srd_decoder *dec;
+
        QString s;
 
        ui->setupUi(this);
@@ -54,8 +52,9 @@ About::About(QWidget *parent) :
        ui->versionInfo->setText(tr("%1 %2<br />%3<br /><a href=\"%4\">%4</a>")
                                 .arg(QApplication::applicationName())
                                 .arg(QApplication::applicationVersion())
-                                .arg(tr("GNU GPL, version 2 or later"))
+                                .arg(tr("GNU GPL, version 3 or later"))
                                 .arg(QApplication::organizationDomain()));
+       ui->versionInfo->setOpenExternalLinks(true);
 
        s.append("<table>");
 
@@ -93,7 +92,7 @@ About::About(QWidget *parent) :
        s.append("<tr><td colspan=\"2\"><b>" +
                tr("Supported protocol decoders:") +
                "</b></td></tr>");
-       for (l = srd_decoder_list(); l; l = l->next) {
+       for (const GSList *l = srd_decoder_list(); l; l = l->next) {
                dec = (struct srd_decoder *)l->data;
                s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
                         .arg(QString(dec->id))