Merge pull request f4exb#1718 from srcejon/fix_1713

Remove comparison of strings and chars
srcejon · Jun 23, 2023 · a8665ed · a8665ed
2 parents b4847f1 + b092a01
commit a8665ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/plugins/channelrx/demodrtty/rttydemodsink.cpp b/plugins/channelrx/demodrtty/rttydemodsink.cpp
@@ -517,7 +517,7 @@ void RttyDemodSink::receiveBit(bool bit)
         else
         {
             QString c = m_rttyDecoder.decode((m_bits >> 1) & 0x1f);
-            if ((c != '\0') && (c != '<') && (c != '>') && (c != '^'))
+            if ((c != "\0") && (c != "<") && (c != ">") && (c != "^"))
             {
                 // Calculate average power over received byte
                 float rssi = CalcDb::dbPower(m_rssiMagSqSum / m_rssiMagSqCount);

diff --git a/sdrbase/util/baudot.cpp b/sdrbase/util/baudot.cpp
@@ -166,25 +166,25 @@ QString BaudotDecoder::decode(char bits)
 {
     QString c = m_figure ? m_figures[(int)bits] : m_letters[(int)bits];
 
-    if ((c == '>') || (m_unshiftOnSpace && (c == " ")))
+    if ((c == ">") || (m_unshiftOnSpace && (c == " ")))
     {
         // Switch to letters
         m_figure = false;
         if (m_characterSet == Baudot::RUSSIAN) {
             m_letters = Baudot::m_ita2Letter;
         }
     }
-    if (c == '<')
+    if (c == "<")
     {
         // Switch to figures
         m_figure = true;
     }
-    if ((m_characterSet == Baudot::RUSSIAN) && (c == '\0'))
+    if ((m_characterSet == Baudot::RUSSIAN) && (c == "\0"))
     {
         // Switch to Cyrillic
         m_figure = false;
         m_letters = Baudot::m_russianLetter;
-        c = '^';
+        c = "^";
     }
 
     return c;