X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=6c1937897d936e1adb971e8e85512e4bb742611f;hp=2e23b1ceac8aeef02a67a6640ba50126973ccadf;hb=HEAD;hpb=3ce5dd9a981d128085dc5ea507dd7157a87be4cb

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 2e23b1ce..9c695a1b 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -17,11 +17,16 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
 #include <cstring>
 #include <forward_list>
 #include <limits>
 
 #include <QDebug>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QRegularExpression>
+#endif
 
 #include "logic.hpp"
 #include "logicsegment.hpp"
@@ -304,7 +309,11 @@ void DecodeSignal::auto_assign_signals(const shared_ptr<Decoder> dec)
 			continue;
 
 		QString ch_name = ch.name.toLower();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+		ch_name = ch_name.replace(QRegularExpression("[-_.]"), " ");
+#else
 		ch_name = ch_name.replace(QRegExp("[-_.]"), " ");
+#endif
 
 		shared_ptr<data::SignalBase> match;
 		for (const shared_ptr<data::SignalBase>& s : session_.signalbases()) {
@@ -312,7 +321,11 @@ void DecodeSignal::auto_assign_signals(const shared_ptr<Decoder> dec)
 				continue;
 
 			QString s_name = s->name().toLower();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+			s_name = s_name.replace(QRegularExpression("[-_.]"), " ");
+#else
 			s_name = s_name.replace(QRegExp("[-_.]"), " ");
+#endif
 
 			if (s->logic_data() &&
 				((ch_name.contains(s_name)) || (s_name.contains(ch_name)))) {
@@ -745,7 +758,11 @@ void DecodeSignal::save_settings(QSettings &settings) const
 	for (const shared_ptr<Decoder>& decoder : stack_) {
 		settings.beginGroup("decoder" + QString::number(decoder_idx++));
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+		settings.setValue("id", (const char *)decoder->get_srd_decoder()->id);
+#else
 		settings.setValue("id", decoder->get_srd_decoder()->id);
+#endif
 		settings.setValue("visible", decoder->visible());
 
 		// Save decoder options
@@ -1373,6 +1390,14 @@ void DecodeSignal::decode_proc()
 
 			// If the input segment is complete, we've exhausted this segment
 			if (input_segment->is_complete()) {
+#if defined HAVE_SRD_SESSION_SEND_EOF && HAVE_SRD_SESSION_SEND_EOF
+				// Tell protocol decoders about the end of
+				// the input data, which may result in more
+				// annotations being emitted
+				(void)srd_session_send_eof(srd_session_);
+				new_annotations();
+#endif
+
 				if (current_segment_id_ < (logic_mux_data_->logic_segments().size() - 1)) {
 					// Process next segment
 					current_segment_id_++;
@@ -1496,6 +1521,9 @@ void DecodeSignal::terminate_srd_session()
 	// those stacks which still are processing data while the
 	// application no longer wants them to.
 	if (srd_session_) {
+#if defined HAVE_SRD_SESSION_SEND_EOF && HAVE_SRD_SESSION_SEND_EOF
+		(void)srd_session_send_eof(srd_session_);
+#endif
 		srd_session_terminate_reset(srd_session_);
 
 		// Metadata is cleared also, so re-set it