From 4f226b0c1162029ed9485eae82734b904e00a419 Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Wed, 2 Jan 2019 12:36:25 -0500
Subject: [PATCH] Cleanup of build frames and a note for later

---
 mainwindow.cpp | 9 ++-------
 varicode.cpp   | 8 --------
 varicode.h     | 6 ------
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 13b9b34..4940e58 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -5741,6 +5741,8 @@ void MainWindow::createMessageTransmitQueue(QString const& text){
       lines.append(dt.message());
   }
 
+  // TODO: jsherer - parse outgoing message so we can add it to the inbox as an outgoing message
+
   displayTextForFreq(lines.join("") + " \u2301 ", freq, DriftingDateTime::currentDateTimeUtc(), true, true, true);
 
   // if we're transmitting a message to be displayed, we should bump the repeat buttons...
@@ -5823,19 +5825,12 @@ QList<QPair<QString, int>> MainWindow::buildMessageFrames(const QString &text){
     QString selectedCall = callsignSelected();
 
     // prepare compound
-    //bool compound = Varicode::isCompoundCallsign(/*Radio::is_compound_callsign(*/m_config.my_callsign());
     QString mycall = m_config.my_callsign();
     QString mygrid = m_config.my_grid().left(4);
-    // QString basecall = Radio::base_callsign(m_config.my_callsign());
-    // if(basecall != mycall){
-    //     basecall = "<....>";
-    // }
 
     auto frames = Varicode::buildMessageFrames(
         mycall,
-        //basecall,
         mygrid,
-        //compound,
         selectedCall,
         text);
 
diff --git a/varicode.cpp b/varicode.cpp
index 4602c25..647c504 100644
--- a/varicode.cpp
+++ b/varicode.cpp
@@ -1651,9 +1651,7 @@ QString Varicode::unpackDataMessage(const QString &text){
 // TODO: remove the dependence on providing all this data?
 QList<QPair<QString, int>> Varicode::buildMessageFrames(
     QString const& mycall,
-    //QString const& basecall,
     QString const& mygrid,
-    //bool compound,
     QString const& selectedCall,
     QString const& text
 ){
@@ -1878,16 +1876,12 @@ QList<QPair<QString, int>> Varicode::buildMessageFrames(
 
 BuildMessageFramesThread::BuildMessageFramesThread(
     const QString &mycall,
-    //const QString &basecall,
     const QString &mygrid,
-    //bool compound,
     const QString &selectedCall,
     const QString &text, QObject *parent):
     QThread(parent),
     m_mycall{mycall},
-    //m_basecall{basecall},
     m_mygrid{mygrid},
-    //m_compound{compound},
     m_selectedCall{selectedCall},
     m_text{text}
 {
@@ -1896,9 +1890,7 @@ BuildMessageFramesThread::BuildMessageFramesThread(
 void BuildMessageFramesThread::run(){
     auto results = Varicode::buildMessageFrames(
         m_mycall,
-        //m_basecall,
         m_mygrid,
-        //m_compound,
         m_selectedCall,
         m_text
     );
diff --git a/varicode.h b/varicode.h
index e8a22b4..6437355 100644
--- a/varicode.h
+++ b/varicode.h
@@ -157,9 +157,7 @@ public:
 
     static QList<QPair<QString, int>> buildMessageFrames(
         QString const& mycall,
-        //QString const& basecall,
         QString const& mygrid,
-        //bool compound,
         QString const& selectedCall,
         QString const& text
     );
@@ -171,9 +169,7 @@ class BuildMessageFramesThread : public QThread
     Q_OBJECT
 public:
     BuildMessageFramesThread(QString const& mycall,
-                             //QString const& basecall,
                              QString const& mygrid,
-                             //bool compound,
                              QString const& selectedCall,
                              QString const& text,
                              QObject *parent=nullptr);
@@ -183,9 +179,7 @@ signals:
 
 private:
     QString m_mycall;
-    //QString m_basecall;
     QString m_mygrid;
-    //bool m_compound;
     QString m_selectedCall;
     QString m_text;
 };