From a3c7b421bd39159e585321d0103191ff6530622b Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Mon, 12 Dec 2022 13:09:07 -0500
Subject: [PATCH] Rename m65c to q65c.
---
q65w/libm65/CMakeLists.txt | 2 +-
q65w/libm65/{m65c.f90 => q65c.f90} | 6 ++----
q65w/mainwindow.cpp | 4 ++--
q65w/mainwindow.h | 2 +-
4 files changed, 6 insertions(+), 8 deletions(-)
rename q65w/libm65/{m65c.f90 => q65c.f90} (95%)
diff --git a/q65w/libm65/CMakeLists.txt b/q65w/libm65/CMakeLists.txt
index e7fdca3b4..b7da3953f 100644
--- a/q65w/libm65/CMakeLists.txt
+++ b/q65w/libm65/CMakeLists.txt
@@ -23,9 +23,9 @@ set (libm65_FSRCS
iqcal.f90
iqfix.f90
lorentzian.f90
- m65c.f90
moon2.f90
moondop.f90
+ q65c.f90
q65wa.f90
recvpkt.f90
sun.f90
diff --git a/q65w/libm65/m65c.f90 b/q65w/libm65/q65c.f90
similarity index 95%
rename from q65w/libm65/m65c.f90
rename to q65w/libm65/q65c.f90
index be3914bc1..b9b4eae07 100644
--- a/q65w/libm65/m65c.f90
+++ b/q65w/libm65/q65c.f90
@@ -1,4 +1,4 @@
-subroutine m65c(itimer)
+subroutine q65c(itimer)
use timer_module, only: timer
use timer_impl, only: fini_timer !, limtrace
@@ -38,8 +38,6 @@ subroutine m65c(itimer)
return
endif
- lq65w=.true.
- lq65w2=.true.
datetime(18:20)=':00'
! if(first) call timer('q65w ',0)
@@ -52,4 +50,4 @@ subroutine m65c(itimer)
call timer('decode0 ',1)
return
-end subroutine m65c
+end subroutine q65c
diff --git a/q65w/mainwindow.cpp b/q65w/mainwindow.cpp
index 73a8bc75b..d2e4f55a4 100644
--- a/q65w/mainwindow.cpp
+++ b/q65w/mainwindow.cpp
@@ -186,7 +186,7 @@ MainWindow::~MainWindow()
{
writeSettings();
int itimer=1;
- m65c_(&itimer);
+ q65c_(&itimer);
if (soundInThread.isRunning()) {
soundInThread.quit();
@@ -901,7 +901,7 @@ void MainWindow::decode() //decode()
decodes_.ncand=0;
m_fetched=0;
int itimer=0;
- watcher3.setFuture(QtConcurrent::run (std::bind (m65c_, &itimer)));
+ watcher3.setFuture(QtConcurrent::run (std::bind (q65c_, &itimer)));
decodeBusy(true);
}
diff --git a/q65w/mainwindow.h b/q65w/mainwindow.h
index 442a28ae2..8eb557063 100644
--- a/q65w/mainwindow.h
+++ b/q65w/mainwindow.h
@@ -215,7 +215,7 @@ extern "C" {
void astrosub00_ (int* nyear, int* month, int* nday, double* uth, int* nfreq,
const char* mygrid, int* ndop00, int len1);
- void m65c_(int* itimer);
+ void q65c_(int* itimer);
}
#endif // MAINWINDOW_H