chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #206: Double compound calls are valid

Browse Source
This commit is contained in:
Jordan Sherer 2019-10-13 20:28:47 -04:00
parent 8ceef83f2e
commit e37089c78a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CallsignValidator.cpp
View File

@ -10,7 +10,7 @@ auto CallsignValidator::validate (QString& input, int& pos) const -> State
{ {
auto match = re_.match (input, 0, QRegularExpression::PartialPreferCompleteMatch); auto match = re_.match (input, 0, QRegularExpression::PartialPreferCompleteMatch);
input = input.toUpper (); input = input.toUpper ();
if (input.count(QLatin1Char('/')) > 1) return Invalid; if (input.count(QLatin1Char('/')) > 2) return Invalid;
if (match.hasMatch ()) return Acceptable; if (match.hasMatch ()) return Acceptable;
if (!input.size () || match.hasPartialMatch ()) return Intermediate; if (!input.size () || match.hasPartialMatch ()) return Intermediate;
pos = input.size (); pos = input.size ();

3
js8call.pro
View File

@ -85,7 +85,8 @@ SOURCES += \
SpotClient.cpp \ SpotClient.cpp \
TCPClient.cpp \ TCPClient.cpp \
TransmitTextEdit.cpp \ TransmitTextEdit.cpp \
NotificationAudio.cpp NotificationAudio.cpp \
CallsignValidator.cpp
HEADERS += qt_helpers.hpp \ HEADERS += qt_helpers.hpp \
pimpl_h.hpp pimpl_impl.hpp \ pimpl_h.hpp pimpl_impl.hpp \