js8call · Chris-AC9KH · Jul 20, 2025 · Aug 13, 2025 · Aug 14, 2025 · Aug 15, 2025
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,21 @@ tags
 output
 docker/config/
 js8call.ini
+#### Xcode patch ####
+Xcode/
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcodeproj/project.xcworkspace/
+!*.xcworkspace/contents.xcworkspacedata
+/*.gcno
+**/xcshareddata/WorkspaceSettings.xcsettings
+xcuserdata/
+.DS_Store
+js8call.entitlements
+JS8Call.entitlements
+## end Xcode patch ##
+#### Qt Creator patch ####
+build/
+CMakeLists.txt.user
+## end Qt Creator patch ##
diff --git a/APRSISClient.cpp b/APRSISClient.cpp
@@ -1,11 +1,14 @@
 #include "APRSISClient.h"
+#include <QLoggingCategory>
 #include <QRandomGenerator>
 
 #include <cmath>
 
 #include "DriftingDateTime.h"
 #include "varicode.h"
 
+Q_DECLARE_LOGGING_CATEGORY(aprsisclient_js8)
+
 const int PACKET_TIMEOUT_SECONDS = 300;
 
 APRSISClient::APRSISClient(QString const host,
@@ -51,7 +54,7 @@ findall(QRegularExpression re,
 {
     qsizetype          pos = 0;
     QList<QStringList> all;
-    
+
     while(pos < content.length())
     {
         auto match = re.match(content, pos);
@@ -262,34 +265,34 @@ void APRSISClient::processQueue(bool disconnect){
     // 4. disconnect
 
     if(state() != QTcpSocket::ConnectedState){
-        qDebug() << "APRSISClient Connecting:" << m_host << m_port;
+        qCDebug(aprsisclient_js8) << "APRSISClient Connecting:" << m_host << m_port;
         connectToHost(m_host, m_port);
         if(!waitForConnected(5000)){
-            qDebug() << "APRSISClient Connection Error:" << errorString();
+            qCDebug(aprsisclient_js8) << "APRSISClient Connection Error:" << errorString();
             return;
         }
     }
 
     auto re = QRegularExpression("(full|unavailable|busy)");
     auto line = QString(readLine());
     if(line.toLower().indexOf(re) >= 0){
-        qDebug() << "APRSISClient Connection Busy:" << line;
+        qCDebug(aprsisclient_js8) << "APRSISClient Connection Busy:" << line;
         return;
     }
 
     if(write(loginFrame(m_localCall).toLocal8Bit()) == -1){
-        qDebug() << "APRSISClient Write Login Error:" << errorString();
+        qCDebug(aprsisclient_js8) << "APRSISClient Write Login Error:" << errorString();
         return;
     }
 
     if(!waitForReadyRead(5000)){
-        qDebug() << "APRSISClient Login Error: Server Not Responding";
+        qCDebug(aprsisclient_js8) << "APRSISClient Login Error: Server Not Responding";
         return;
     }
 
     line = QString(readAll());
     if(line.toLower().indexOf(re) >= 0){
-        qDebug() << "APRSISClient Server Busy:" << line;
+        qCDebug(aprsisclient_js8) << "APRSISClient Server Busy:" << line;
         return;
     }
 
@@ -302,32 +305,32 @@ void APRSISClient::processQueue(bool disconnect){
 
         // if the packet is older than the timeout, drop it.
         if(timestamp.secsTo(DriftingDateTime::currentDateTimeUtc()) > PACKET_TIMEOUT_SECONDS){
-            qDebug() << "APRSISClient Packet Timeout:" << frame;
+            qCDebug(aprsisclient_js8) << "APRSISClient Packet Timeout:" << frame;
             m_frameQueue.dequeue();
             continue;
         }
 
         // random delay 25% of the time for throttling (a skip will add 60 seconds to the processing time)
         if(m_skipPercent > 0 && QRandomGenerator::global()->generate() % 100 <= (m_skipPercent*100)){
-            qDebug() << "APRSISClient Throttle: Skipping Frame";
+            qCDebug(aprsisclient_js8) << "APRSISClient Throttle: Skipping Frame";
             delayed.enqueue(m_frameQueue.dequeue());
             continue;
         }
 
         QByteArray data = frame.toLocal8Bit();
         if(write(data) == -1){
-            qDebug() << "APRSISClient Write Error:" << errorString();
+            qCDebug(aprsisclient_js8) << "APRSISClient Write Error:" << errorString();
             return;
         }
 
-        qDebug() << "APRSISClient Write:" << data;
+        qCDebug(aprsisclient_js8) << "APRSISClient Write:" << data;
         if(waitForReadyRead(5000)){
             line = QString(readLine());
 
-            qDebug() << "APRSISClient Read:" << line;
+            qCDebug(aprsisclient_js8) << "APRSISClient Read:" << line;
 
             if(line.toLower().indexOf(re) >= 0){
-                qDebug() << "APRSISClient Cannot Write Error:" << line;
+                qCDebug(aprsisclient_js8) << "APRSISClient Cannot Write Error:" << line;
                 return;
             }
         }
@@ -344,3 +347,5 @@ void APRSISClient::processQueue(bool disconnect){
         disconnectFromHost();
     }
 }
+
+Q_LOGGING_CATEGORY(aprsisclient_js8, "aprsisclient.js8", QtWarningMsg)
diff --git a/APRSISClient.h b/APRSISClient.h
@@ -1,13 +1,16 @@
 #ifndef APRSISCLIENT_H
 #define APRSISCLIENT_H
 
+#include <QLoggingCategory>
 #include <QtGlobal>
 #include <QDateTime>
 #include <QTcpSocket>
 #include <QQueue>
 #include <QPair>
 #include <QTimer>
 
+Q_DECLARE_LOGGING_CATEGORY(aprsisclient_js8)
+
 class APRSISClient : public QTcpSocket
 {
 public:
@@ -39,7 +42,7 @@ public slots:
         m_host = host;
         m_port = port;
 
-        qDebug() << "APRSISClient Server Change:" << m_host << m_port;
+        qCDebug(aprsisclient_js8) << "APRSISClient Server Change:" << m_host << m_port;
     }
 
     void setPaused(bool paused){

diff --git a/AttenuationSlider.cpp b/AttenuationSlider.cpp
@@ -137,10 +137,10 @@ namespace
                                             gradRect.top(),
                                             gradRect.center().x(),
                                             gradRect.bottom());
-                                    
+
       gradient.setColorAt(0, handleStartColor);
       gradient.setColorAt(1, handleStopColor);
-      
+
       QPainter p(&pixmap);
 
       p.setRenderHint(QPainter::Antialiasing, true);

diff --git a/AudioDevice.cpp b/AudioDevice.cpp
@@ -1,10 +1,10 @@
-#include "AudioDevice.hpp"
-
-bool AudioDevice::initialize (OpenMode mode, Channel channel)
-{
-  m_channel = channel;
-
-  // open and ensure we are unbuffered if possible
-  return QIODevice::open (mode | QIODevice::Unbuffered);
-}
-
+#include "AudioDevice.hpp"
+
+bool AudioDevice::initialize (OpenMode mode, Channel channel)
+{
+  m_channel = channel;
+
+  // open and ensure we are unbuffered if possible
+  return QIODevice::open (mode | QIODevice::Unbuffered);
+}
+
diff --git a/CMake/Modules/FindFFTW3.cmake b/CMake/Modules/FindFFTW3.cmake
@@ -8,9 +8,9 @@
 #  FFTW3_INCLUDE_DIR          - the FFTW3 include directory (cached)
 #  FFTW3_INCLUDE_DIRS         - the FFTW3 include directories
 #                               (identical to FFTW3_INCLUDE_DIR)
-#  FFTW3[FL]?_LIBRARY         - the FFTW3 library - double, single(F), 
+#  FFTW3[FL]?_LIBRARY         - the FFTW3 library - double, single(F),
 #                               long-double(L) precision (cached)
-#  FFTW3[FL]?_THREADS_LIBRARY - the threaded FFTW3 library - double, single(F), 
+#  FFTW3[FL]?_THREADS_LIBRARY - the threaded FFTW3 library - double, single(F),
 #                               long-double(L) precision (cached)
 #  FFTW3_LIBRARIES            - list of all FFTW3 libraries found
 
@@ -88,7 +88,7 @@ foreach (_lib ${_libraries})
 endforeach (_lib ${_libraries})
 
 # Search for the header file.
-find_path (FFTW3_INCLUDE_DIR fftw3.h 
+find_path (FFTW3_INCLUDE_DIR fftw3.h
   HINTS ${FFTW3_ROOT_DIR} PATH_SUFFIXES include)
 mark_as_advanced (FFTW3_INCLUDE_DIR)
 list(APPEND _check_list FFTW3_INCLUDE_DIR)

diff --git a/CMake/Modules/FindUsb.cmake b/CMake/Modules/FindUsb.cmake
@@ -1,49 +1,49 @@
-# Findlibusb
-# ==========
-#
-# Find the usb library
-#
-# This will define the following variables::
-#
-#  Usb_FOUND	- True if the system has the usb library
-#  Usb_VERSION	- The verion of the usb library which was found
-#
-# and the following imported targets::
-#
-#  Usb::Usb	- The libusb library
-#
-
-include (LibFindMacros)
-
-if (WIN32)
-  # Use path suffixes on MS Windows as we probably shouldn't
-  # trust the PATH envvar. PATH will still be searched to find the
-  # library as last resort.
-  if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-    set (_library_options PATH_SUFFIXES MinGW64/dll MinGW64/static)
-  else ()
-    set (_library_options PATH_SUFFIXES MinGW32/dll MinGW32/static)
-  endif ()
-endif ()
-libfind_pkg_detect (Usb usb-1.0
-  FIND_PATH libusb.h PATH_SUFFIXES libusb-1.0
-  FIND_LIBRARY usb-1.0 ${_library_options}
-  )
-
-libfind_process (Usb)
-
-if (Usb_FOUND AND NOT TARGET Usb::Usb)
-  add_library (Usb::Usb UNKNOWN IMPORTED)
-  set_target_properties (Usb::Usb PROPERTIES
-    IMPORTED_LOCATION "${Usb_LIBRARY}"
-    INTERFACE_COMPILE_OPTIONS "${Usb_PKGCONF_CFLAGS_OTHER}"
-    INTERFACE_INCLUDE_DIRECTORIES "${Usb_INCLUDE_DIRS}"
-    INTERFACE_LINK_LIBRARIES "${Usb_LIBRARIES}"
-    )
-endif ()
-
-mark_as_advanced (
-  Usb_INCLUDE_DIR
-  Usb_LIBRARY
-  Usb_LIBRARIES
-  )
+# Findlibusb
+# ==========
+#
+# Find the usb library
+#
+# This will define the following variables::
+#
+#  Usb_FOUND	- True if the system has the usb library
+#  Usb_VERSION	- The verion of the usb library which was found
+#
+# and the following imported targets::
+#
+#  Usb::Usb	- The libusb library
+#
+
+include (LibFindMacros)
+
+if (WIN32)
+  # Use path suffixes on MS Windows as we probably shouldn't
+  # trust the PATH envvar. PATH will still be searched to find the
+  # library as last resort.
+  if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+    set (_library_options PATH_SUFFIXES MinGW64/dll MinGW64/static)
+  else ()
+    set (_library_options PATH_SUFFIXES MinGW32/dll MinGW32/static)
+  endif ()
+endif ()
+libfind_pkg_detect (Usb usb-1.0
+  FIND_PATH libusb.h PATH_SUFFIXES libusb-1.0
+  FIND_LIBRARY usb-1.0 ${_library_options}
+  )
+
+libfind_process (Usb)
+
+if (Usb_FOUND AND NOT TARGET Usb::Usb)
+  add_library (Usb::Usb UNKNOWN IMPORTED)
+  set_target_properties (Usb::Usb PROPERTIES
+    IMPORTED_LOCATION "${Usb_LIBRARY}"
+    INTERFACE_COMPILE_OPTIONS "${Usb_PKGCONF_CFLAGS_OTHER}"
+    INTERFACE_INCLUDE_DIRECTORIES "${Usb_INCLUDE_DIRS}"
+    INTERFACE_LINK_LIBRARIES "${Usb_LIBRARIES}"
+    )
+endif ()
+
+mark_as_advanced (
+  Usb_INCLUDE_DIR
+  Usb_LIBRARY
+  Usb_LIBRARIES
+  )
diff --git a/CMake/Modules/NSIS.template.in b/CMake/Modules/NSIS.template.in
@@ -49,7 +49,7 @@
   !define FileExists `'' FileExists2`
   !macro _DirExists _a _b _t _f
 	!insertmacro _LOGICLIB_TEMP
-	StrCpy $_LOGICLIB_TEMP '0'	
+	StrCpy $_LOGICLIB_TEMP '0'
 	StrCmp `${_b}` `` +3 0 ;if path is not blank, continue to next check
 	IfFileExists `${_b}\*.*` 0 +2 ;if directory exists, continue to confirm exists
 	StrCpy $_LOGICLIB_TEMP '1'

diff --git a/CMake/Modules/QtAxMacros.cmake b/CMake/Modules/QtAxMacros.cmake
@@ -13,9 +13,9 @@ if (WIN32)
     set (options)
     set (oneValueArgs)
     set (multiValueArgs OPTIONS)
-    
+
     cmake_parse_arguments (_WRAP_AX_SERVER "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    
+
     set (ax_server_files ${_WRAP_AX_SERVER_UNPARSED_ARGUMENTS})
     set (ax_server_options ${_WRAP_AX_SERVER_OPTIONS})
 

diff --git a/CMake/VersionCompute.cmake → CMake/Modules/VersionCompute.cmake b/CMake/VersionCompute.cmake → CMake/Modules/VersionCompute.cmake
@@ -9,3 +9,4 @@ elseif (NOT WSJTX_VERSION_IS_RELEASE)
 endif (WSJTX_RC AND NOT WSJTX_VERSION_IS_RELEASE)
 
 set (wsjtx_VERSION ${WSJTX_VERSION_MAJOR}.${WSJTX_VERSION_MINOR}.${WSJTX_VERSION_PATCH})
+set (wsjtx_SHORT_VERSION ${WSJTX_VERSION_MAJOR}.${WSJTX_VERSION_MINOR}.0)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,4 @@ elseif (NOT WSJTX_VERSION_IS_RELEASE)
		endif (WSJTX_RC AND NOT WSJTX_VERSION_IS_RELEASE)

		set (wsjtx_VERSION ${WSJTX_VERSION_MAJOR}.${WSJTX_VERSION_MINOR}.${WSJTX_VERSION_PATCH})
		set (wsjtx_SHORT_VERSION ${WSJTX_VERSION_MAJOR}.${WSJTX_VERSION_MINOR}.0)