From 88fb605b409267831ee649f9ff7fb01606cd0eea Mon Sep 17 00:00:00 2001 From: Jordan Sherer Date: Sun, 23 Dec 2018 08:54:31 -0500 Subject: [PATCH] Removed remnants of WSJT-X references --- Configuration.ui | 6 +++--- logbook/adif.cpp | 2 +- main.cpp | 1 - mainwindow.cpp | 24 +----------------------- psk_reporter.cpp | 2 +- 5 files changed, 6 insertions(+), 29 deletions(-) diff --git a/Configuration.ui b/Configuration.ui index 602c91e..e183610 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -2220,7 +2220,7 @@ comments field. - <html><head/><body><p>With this enabled WSJT-X will accept certain requests back from a UDP server that receives decode messages.</p></body></html> + <html><head/><body><p>With this enabled the app will accept certain requests back from a UDP server that receives decode messages.</p></body></html> Accept UDP requests @@ -2384,7 +2384,7 @@ for assessing propagation and system performance. - <html><head/><body><p>When checked, WSJT-X will broadcast a logged contact in ADIF format to the configured hostname and port. </p></body></html> + <html><head/><body><p>When checked, the app will broadcast a logged contact in ADIF format to the configured hostname and port. </p></body></html> Enable logged contact ADIF broadcast @@ -2505,7 +2505,7 @@ for assessing propagation and system performance. - <html><head/><body><p>See &quot;Frequency Calibration&quot; in the WSJT-X User Guide for details of how to determine these parameters for your radio.</p></body></html> + <html><head/><body><p>See &quot;Frequency Calibration&quot; in the User Guide for details of how to determine these parameters for your radio.</p></body></html> Frequency Calibration diff --git a/logbook/adif.cpp b/logbook/adif.cpp index 6a646b0..a8ea30c 100644 --- a/logbook/adif.cpp +++ b/logbook/adif.cpp @@ -213,7 +213,7 @@ bool ADIF::addQSOToFile(QByteArray const& ADIF_record) { QTextStream out(&f2); if (f2.size()==0) - out << "WSJT-X ADIF Export" << endl; // new file + out << "JS8Call ADIF Export" << endl; // new file out << ADIF_record << " " << endl; f2.close(); diff --git a/main.cpp b/main.cpp index bcca36d..3a95b66 100644 --- a/main.cpp +++ b/main.cpp @@ -107,7 +107,6 @@ int main(int argc, char *argv[]) // that GUI has correct l18n // Override programs executable basename as application name. - //a.setApplicationName ("WSJT-X"); a.setApplicationName("JS8Call"); a.setApplicationVersion (version ()); diff --git a/mainwindow.cpp b/mainwindow.cpp index 42b24b9..d43d147 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1079,28 +1079,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, //splashTimer.setSingleShot (true); //splashTimer.start (20 * 1000); -/* - if(m_config.my_callsign()=="K1JT" or m_config.my_callsign()=="K9AN" or - m_config.my_callsign()=="G4WJS" or - m_config.my_callsign().contains("KH7Z")) { - ui->actionWSPR_LF->setEnabled(true); - } else { - QString errorMsg; - MessageBox::critical_message (this, - "Code in the WSJT-X development branch is\n" - "not currently available for on-the-air use.\n\n" - "Please use WSJT-X v1.8.0\n", errorMsg); - Q_EMIT finished (); - } -*/ - - /* - if(QCoreApplication::applicationVersion().contains("-devel") or - QCoreApplication::applicationVersion().contains("-rc")) { - QTimer::singleShot (0, this, SLOT (not_GA_warning_message ())); - } - */ - // TODO: jsherer - need to remove this eventually... QTimer::singleShot (0, this, SLOT (checkStartupWarnings ())); @@ -4459,7 +4437,7 @@ void MainWindow::guiUpdate() if(onAirFreq!=m_onAirFreq0) { m_onAirFreq0=onAirFreq; auto const& message = tr ("Please choose another Tx frequency." - " WSJT-X will not knowingly transmit another" + " The app will not knowingly transmit another" " mode in the WSPR sub-band on 30m."); #if QT_VERSION >= 0x050400 QTimer::singleShot (0, [=] { // don't block guiUpdate diff --git a/psk_reporter.cpp b/psk_reporter.cpp index 8f3dbde..5ccbc5a 100644 --- a/psk_reporter.cpp +++ b/psk_reporter.cpp @@ -127,7 +127,7 @@ void PSK_Reporter::dnsLookupResult(QHostInfo info) // qDebug() << "PSK Reporter IP: " << m_pskReporterAddress; // deal with miss-configured settings that attempt to set a - // Pskreporter Internet address for the WSJT-X UDP protocol + // Pskreporter Internet address for the UDP protocol // server address m_messageClient->add_blocked_destination (m_pskReporterAddress); }