From c62d8832f1ad5f4b204b4dc8bd79705172ba62b1 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Fri, 23 Sep 2022 17:02:06 +0100
Subject: [PATCH] Hopefully fix compile warning on linux

---
 loggingwindow.h | 6 +++---
 main.cpp        | 6 ++----
 wfmain.h        | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/loggingwindow.h b/loggingwindow.h
index 24e7e4c..d7afe71 100644
--- a/loggingwindow.h
+++ b/loggingwindow.h
@@ -60,14 +60,14 @@ signals:
     void setDebugMode(bool debugOn);
 
 private:
-    Ui::loggingWindow *ui;
+    Ui::loggingWindow* ui;
+    QString logFilename;
+    QString logDirectory;
     QClipboard *clipboard;
     QMessageBox URLmsgBox;
     QScrollBar *vertLogScroll;
     QScrollBar *horizLogScroll;
     QMutex textMutex;
-    QString logFilename;
-    QString logDirectory;
     QTcpSocket *socket;
     void sendToTermbin();
 };
diff --git a/main.cpp b/main.cpp
index d000415..88d020e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -74,13 +74,11 @@ int main(int argc, char *argv[])
     QString serialPortCL;
     QString hostCL;
     QString civCL;
+
     QDateTime date = QDateTime::currentDateTime();
     QString formattedTime = date.toString("dd.MM.yyyy hh:mm:ss");
-#ifdef Q_OS_MAC
-    QString logFilename = (QString("%1/%2-%3.log").arg(QStandardPaths::standardLocations(QStandardPaths::DownloadLocation)[0]).arg(a.applicationName()).arg(date.toString("yyyyMMddhhmmss")));
-#else
     QString logFilename = (QString("%1/%2-%3.log").arg(QStandardPaths::standardLocations(QStandardPaths::TempLocation)[0]).arg(a.applicationName()).arg(date.toString("yyyyMMddhhmmss")));
-#endif
+
     QString settingsFile = NULL;
     QString currentArg;
 
diff --git a/wfmain.h b/wfmain.h
index 95f5f84..1240126 100644
--- a/wfmain.h
+++ b/wfmain.h
@@ -650,6 +650,7 @@ private slots:
 private:
     Ui::wfmain *ui;
     void closeEvent(QCloseEvent *event);
+    QString logFilename;
     bool debugMode;
     QString version;
     QSettings *settings=Q_NULLPTR;
@@ -662,7 +663,6 @@ private:
     void initLogging();
     QTimer logCheckingTimer;
     int logCheckingOldPosition = 0;
-    QString logFilename;
 
     QCustomPlot *plot; // line plot
     QCustomPlot *wf; // waterfall image