From 823afde91ad364553e381ea37feaefbdb931cb68 Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Mon, 10 May 2021 13:43:06 +0100
Subject: [PATCH] Allow but remove leading/trail white space in DX Call field

this allows  pasting callsigns from  the clipboard that  might include
them.
---
 validators/CallsignValidator.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/validators/CallsignValidator.cpp b/validators/CallsignValidator.cpp
index ddcd64f16..d6e1bb2c9 100644
--- a/validators/CallsignValidator.cpp
+++ b/validators/CallsignValidator.cpp
@@ -2,14 +2,24 @@
 
 CallsignValidator::CallsignValidator (QObject * parent, bool allow_compound)
   : QValidator {parent}
-  , re_ {allow_compound ? R"(^[A-Za-z0-9/]+$)" : R"(^[A-Za-z0-9]+$)"}
+  , re_ {allow_compound ? R"(^[A-Z0-9/]+$)" : R"(^[A-Z0-9]+$)"}
 {
 }
 
 auto CallsignValidator::validate (QString& input, int& pos) const -> State
 {
-  auto match = re_.match (input, 0, QRegularExpression::PartialPreferCompleteMatch);
   input = input.toUpper ();
+  while (input.size () && input[0].isSpace ())
+    {
+      input.remove (0, 1);
+      if (pos > 0) --pos;
+    }
+  while (input.size () && input[input.size ()].isSpace ())
+    {
+      if (pos > input.size ()) --pos;
+      input.chop (1);
+    }
+  auto match = re_.match (input, 0, QRegularExpression::PartialPreferCompleteMatch);
   if (match.hasMatch ()) return Acceptable;
   if (!input.size () || match.hasPartialMatch ()) return Intermediate;
   pos = input.size ();