projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added error handling to SigSession::add_decoder
[pulseview.git]
/
pv
/
dialogs
/
about.cpp
diff --git
a/pv/dialogs/about.cpp
b/pv/dialogs/about.cpp
index fc206551238bbfd7ab6b73896725bf73cb1aa22e..806dc4c5c057c6ee2bafa76e1700039230b18367 100644
(file)
--- a/
pv/dialogs/about.cpp
+++ b/
pv/dialogs/about.cpp
@@
-18,9
+18,7
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifdef ENABLE_SIGROKDECODE
-#include <sigrokdecode.h>
-#endif
+#include <libsigrokdecode/libsigrokdecode.h>
#include <QTextDocument>
#include <QTextDocument>
@@
-44,9
+42,7
@@
About::About(QWidget *parent) :
struct sr_input_format **inputs;
struct sr_output_format **outputs;
struct sr_input_format **inputs;
struct sr_output_format **outputs;
-#ifdef ENABLE_SIGROKDECODE
struct srd_decoder *dec;
struct srd_decoder *dec;
-#endif
QString s;
QString s;
@@
-93,7
+89,6
@@
About::About(QWidget *parent) :
.arg(QString(outputs[i]->description)));
}
.arg(QString(outputs[i]->description)));
}
-#ifdef ENABLE_SIGROKDECODE
s.append("<tr><td colspan=\"2\"><b>" +
tr("Supported protocol decoders:") +
"</b></td></tr>");
s.append("<tr><td colspan=\"2\"><b>" +
tr("Supported protocol decoders:") +
"</b></td></tr>");
@@
-103,7
+98,6
@@
About::About(QWidget *parent) :
.arg(QString(dec->id))
.arg(QString(dec->longname)));
}
.arg(QString(dec->id))
.arg(QString(dec->longname)));
}
-#endif
s.append("</table>");
s.append("</table>");