bcb5b78c74f06cc878cb347b9f99b08cddfafef4.patch

From bcb5b78c74f06cc878cb347b9f99b08cddfafef4 Mon Sep 17 00:00:00 2001
From: jontio <jontio@i4free.co.nz>
Date: Sat, 26 Oct 2019 08:59:37 +1300
Subject: [PATCH] compiles with QMAKE_CXXFLAGS += '-Werror=format-security'.
 changed location of math constants define.

---
 JAERO/DSP.h               |  1 -
 JAERO/JAERO.pro           |  4 ++++
 JAERO/downloadmanager.cpp | 10 +++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/JAERO/DSP.h b/JAERO/DSP.h
index ddef3ff..d960c31 100644
--- a/JAERO/DSP.h
+++ b/JAERO/DSP.h
@@ -3,7 +3,6 @@
 #ifndef DSPH
 #define DSPH
 //---------------------------------------------------------------------------
-#define _USE_MATH_DEFINES
 #include <math.h>
 #include <vector>
 #include <complex>
diff --git a/JAERO/JAERO.pro b/JAERO/JAERO.pro
index a9116e4..540620b 100644
--- a/JAERO/JAERO.pro
+++ b/JAERO/JAERO.pro
@@ -53,6 +53,8 @@ contains(QT_ARCH, i386) {
     DEFINES += kiss_fft_scalar=double
 }
 
+DEFINES += _USE_MATH_DEFINES
+
 SOURCES += main.cpp\
         mainwindow.cpp \
     coarsefreqestimate.cpp \
@@ -243,3 +245,5 @@ INSTALLS += target
 # disable stupid deprecated-copy warnings
 # cluttering up issues
 QMAKE_CXXFLAGS += '-Wno-deprecated-copy'
+
+#QMAKE_CXXFLAGS += '-Werror=format-security'
diff --git a/JAERO/downloadmanager.cpp b/JAERO/downloadmanager.cpp
index 6cefa1d..0a7fe56 100644
--- a/JAERO/downloadmanager.cpp
+++ b/JAERO/downloadmanager.cpp
@@ -93,7 +93,7 @@ void DownloadManager::startNextDownload()
     if (downloadQueue.isEmpty())
     {
         pd.hide();
-        qDebug(qPrintable(((QString)"").sprintf("%d/%d files downloaded successfully\n", downloadedCount, totalCount)));
+        qDebug()<<QString::asprintf("%d/%d files downloaded successfully\n", downloadedCount, totalCount);
 
         if(downloadedCount||(totalCount>1))
         {
@@ -128,13 +128,13 @@ void DownloadManager::startNextDownload()
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.exec();
 
-        qCritical(qPrintable(((QString)"").sprintf(
+        qCritical()<<QString::asprintf(
 
                                  "Problem opening save file '%s' for download '%s': %s\n",
                                                  qPrintable(tmptofilalfilenamemap.value(filename)), url.toEncoded().constData(),
                                                  qPrintable(output.errorString())
 
-                                 )));
+                                 );
 
         startNextDownload();
         return;                 // skip this download
@@ -184,11 +184,11 @@ void DownloadManager::downloadFinished()
 
         // download failed
 
-        qCritical(qPrintable(((QString)"").sprintf(
+        qCritical()<<QString::asprintf(
 
                                  "Download Failed: %s", qPrintable(currentDownload->errorString())
 
-                                 )));
+                                 );
 
         QMessageBox msgBox;
         msgBox.setText("Download failed.");