X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fabout.cpp;h=8484e47b371062426620dd2d4e27befa8c7c2dc3;hb=27e8df221014d1a8c7769866773e8dbb0486eea8;hp=fc206551238bbfd7ab6b73896725bf73cb1aa22e;hpb=0ec7aba5edea629f9b5b87c18b6511dfd6479470;p=pulseview.git

diff --git a/pv/dialogs/about.cpp b/pv/dialogs/about.cpp
index fc20655..8484e47 100644
--- 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
  */
 
-#ifdef ENABLE_SIGROKDECODE
-#include <sigrokdecode.h>
-#endif
+#include <libsigrokdecode/libsigrokdecode.h>
 
 #include <QTextDocument>
 
@@ -44,9 +42,7 @@ About::About(QWidget *parent) :
 	struct sr_input_format **inputs;
 	struct sr_output_format **outputs;
 
-#ifdef ENABLE_SIGROKDECODE
 	struct srd_decoder *dec;
-#endif
 
 	QString s;
 
@@ -69,8 +65,8 @@ About::About(QWidget *parent) :
 	drivers = sr_driver_list();
 	for (int i = 0; drivers[i]; ++i) {
 		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
-			 .arg(QString(drivers[i]->name))
-			 .arg(QString(drivers[i]->longname)));
+			 .arg(QString::fromUtf8(drivers[i]->name))
+			 .arg(QString::fromUtf8(drivers[i]->longname)));
 	}
 
 	s.append("<tr><td colspan=\"2\"><b>" +
@@ -79,8 +75,8 @@ About::About(QWidget *parent) :
 	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(inputs[i]->id))
-			 .arg(QString(inputs[i]->description)));
+			 .arg(QString::fromUtf8(inputs[i]->id))
+			 .arg(QString::fromUtf8(inputs[i]->description)));
 	}
 
 	s.append("<tr><td colspan=\"2\"><b>" +
@@ -89,21 +85,19 @@ About::About(QWidget *parent) :
 	outputs = sr_output_list();
 	for (int i = 0; outputs[i]; ++i) {
 		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
-			.arg(QString(outputs[i]->id))
-			.arg(QString(outputs[i]->description)));
+			.arg(QString::fromUtf8(outputs[i]->id))
+			.arg(QString::fromUtf8(outputs[i]->description)));
 	}
 
-#ifdef ENABLE_SIGROKDECODE
 	s.append("<tr><td colspan=\"2\"><b>" +
 		tr("Supported protocol decoders:") +
 		"</b></td></tr>");
 	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))
-			 .arg(QString(dec->longname)));
+			 .arg(QString::fromUtf8(dec->id))
+			 .arg(QString::fromUtf8(dec->longname)));
 	}
-#endif
 
 	s.append("</table>");