From e1928f32066be818b8dfdc4909a979ea029276d6 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 6 Dec 2021 16:00:28 -0500 Subject: [PATCH] Add ;$ characters to message_alphabet in Configuration.cpp; move $ to end in same regexp in mainwindow.cpp. --- Configuration.cpp | 2 +- widgets/mainwindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration.cpp b/Configuration.cpp index bd6328a0c..7b78abed0 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -208,7 +208,7 @@ namespace int const combo_box_item_disabled (0); // QRegExp message_alphabet {"[- A-Za-z0-9+./?]*"}; - QRegularExpression message_alphabet {"[- @A-Za-z0-9+./?#<>]*"}; + QRegularExpression message_alphabet {"[- @A-Za-z0-9+./?#<>;$]*"}; QRegularExpression RTTY_roundup_exchange_re { R"( ( diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 9ff4ae175..b6cb6542b 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -212,7 +212,7 @@ using SpecOp = Configuration::SpecialOperatingActivity; namespace { Radio::Frequency constexpr default_frequency {14076000}; - QRegExp message_alphabet {"[$- @A-Za-z0-9+./?#<>;]*"}; + QRegExp message_alphabet {"[- @A-Za-z0-9+./?#<>;$]*"}; // grid exact match excluding RR73 QRegularExpression grid_regexp {"\\A(?![Rr]{2}73)[A-Ra-r]{2}[0-9]{2}([A-Xa-x]{2}){0,1}\\z"}; auto quint32_max = std::numeric_limits::max ();