fixing command-line only build for eventual dtls support

dannagle · Oct 8, 2024 · c5f003e · c5f003e
1 parent 2824a47
commit c5f003e
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 10 deletions.
diff --git a/src/PacketSender.pro b/src/PacketSender.pro
@@ -18,9 +18,6 @@ TRANSLATIONS += languages/packetsender_en.ts \
                 languages/packetsender_it.ts
 
 SOURCES += mainwindow.cpp \
-    association.cpp \
-    dtlsserver.cpp \
-    dtlsthread.cpp \
     languagechooser.cpp \
     panel.cpp \
     sendpacketbutton.cpp \
@@ -39,9 +36,6 @@ SOURCES += mainwindow.cpp \
     wakeonlan.cpp
 
 HEADERS  += mainwindow.h \
-    association.h \
-    dtlsserver.h \
-    dtlsthread.h \
     languagechooser.h \
     panel.h \
     sendpacketbutton.h \

diff --git a/src/association.cpp b/src/association.cpp
@@ -3,6 +3,7 @@
 
 #include "association.h"
 #include "packet.h"
+#include "globals.h"
 #include <QTimer>
 #include <QCoreApplication>
 

diff --git a/src/dtlsserver.cpp b/src/dtlsserver.cpp
@@ -2,10 +2,29 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 #include "dtlsserver.h"
+#include "globals.h"
 
 #include <algorithm>
+#ifndef CONSOLE_BUILD
 #include <QMessageBox>
 
+#else
+
+class QMessageBox {
+public:
+    QMessageBox() {
+
+    };
+    ~QMessageBox() {
+
+    }
+    static void critical(void * ptr, QString msg1, QString msg2) {
+        return;
+    }
+
+};
+#endif
+
 bool DtlsServer::closeNotifyReceived = false;
 
 namespace {

diff --git a/src/dtlsthread.cpp b/src/dtlsthread.cpp
@@ -3,7 +3,6 @@
 #include "packet.h"
 #include "association.h"
 #include "packetnetwork.h"
-#include "mainwindow.h"
 #include <QThread>
 //#include "QSettings"
 

diff --git a/src/dtlsthread.h b/src/dtlsthread.h
@@ -3,6 +3,7 @@
 
 #include <QThread>
 #include "packet.h"
+#include "globals.h"
 #include "QSettings"
 #include "association.h"
 //#include "QTimer"

diff --git a/src/packetnetwork.cpp b/src/packetnetwork.cpp
@@ -956,7 +956,13 @@ void PacketNetwork::packetToSend(Packet sendpacket)
                  << connect(thread, SIGNAL(packetSent(Packet)), this, SLOT(packetSentECHO(Packet)))
                  << connect(thread, SIGNAL(destroyed()), this, SLOT(disconnected()));
 
-        if(settings.value("leaveSessionOpen").toString() == "true"){
+        bool leaveSessionOpen = settings.value("leaveSessionOpen").toString() == "true";
+#ifndef CONSOLE_BUILD
+        leaveSessionOpen = false;
+#endif
+        if(leaveSessionOpen){
+#ifndef CONSOLE_BUILD
+
             thread->persistentRequest=true;
             PersistentConnection * pcWindow = new PersistentConnection();
 
@@ -974,6 +980,7 @@ void PacketNetwork::packetToSend(Packet sendpacket)
             pcWindow->show();
             thread->start();
 
+#endif
 
         }
         else{

diff --git a/src/packetsender_main.pri b/src/packetsender_main.pri
@@ -1,5 +1,8 @@
 
 SOURCES += main.cpp\
+association.cpp \
+dtlsserver.cpp \
+dtlsthread.cpp \
         mainpacketreceiver.cpp \
     packetnetwork.cpp \
     packet.cpp \
@@ -9,6 +12,9 @@ SOURCES += main.cpp\
 
 
 HEADERS  += mainpacketreceiver.h \
+association.h \
+dtlsserver.h \
+dtlsthread.h \
     packetnetwork.h \
     packet.h \
     globals.h \

diff --git a/src/settings.h b/src/settings.h
@@ -2,15 +2,13 @@
 #define SETTINGS_H
 
 #include "globals.h"
-#include "mainwindow.h"
 
 #ifndef CONSOLE_BUILD
 #include <QDialog>
 #include "packet.h"
 #endif
 #include <QSettings>
 #include <QList>
-#include <QCheckBox>
 
 
 #ifdef CONSOLE_BUILD
@@ -55,6 +53,9 @@ class Settings {
 };
 #else
 
+#include "mainwindow.h"
+#include <QCheckBox>
+
 
 namespace Ui
 {