From 66feb996305d3cf5eef6f55edb24e3d533afa74a Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 23 Sep 2017 18:09:29 +0000 Subject: [PATCH] Tidy up some ugly code git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8112 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- displaytext.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/displaytext.cpp b/displaytext.cpp index fb8c31786..61946ee52 100644 --- a/displaytext.cpp +++ b/displaytext.cpp @@ -202,15 +202,11 @@ void DisplayText::displayDecodedText(DecodedText const& decodedText, QString con or decodedText.indexOf (" " + myCall + ">") >= 0)) { bg = color_MyCall; } - // if enabled add the DXCC entity and B4 status to the end of the - // preformated text line t1 auto message = decodedText.string (); - int nbsp_position = message.indexOf (QChar::Nbsp); - if (nbsp_position >= 0) - { - message = message.left (nbsp_position); - } + message = message.left (message.indexOf (QChar::Nbsp)); // strip appended info if (displayDXCCEntity && CQcall) + // if enabled add the DXCC entity and B4 status to the end of the + // preformated text line t1 message = appendDXCCWorkedB4 (message, decodedText.CQersCall (), &bg, logBook, color_CQ, color_DXCC, color_NewCall); appendText (message.trimmed (), bg);