From 7b09b2fe60ca88f513dc93c879c394b2b180db23 Mon Sep 17 00:00:00 2001 From: Kiara Navarro Date: Fri, 13 May 2022 17:38:05 -0500 Subject: [PATCH 1/2] gui/main: remove headers --- Software/PC_Application/main.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Software/PC_Application/main.cpp b/Software/PC_Application/main.cpp index b15105f..13c92a5 100644 --- a/Software/PC_Application/main.cpp +++ b/Software/PC_Application/main.cpp @@ -1,12 +1,6 @@ #include "appwindow.h" -#include "Calibration/calkit.h" -#include "touchstone.h" - -#include -#include #include #include -#include static QApplication *app; static AppWindow *window; From 9434b9d5905575affef22c8ea9c22dedd4a0c25f Mon Sep 17 00:00:00 2001 From: Kiara Navarro Date: Fri, 13 May 2022 18:59:35 -0500 Subject: [PATCH 2/2] gui/main: refactor signal handler --- Software/PC_Application/main.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Software/PC_Application/main.cpp b/Software/PC_Application/main.cpp index 13c92a5..2ffbf9d 100644 --- a/Software/PC_Application/main.cpp +++ b/Software/PC_Application/main.cpp @@ -1,15 +1,19 @@ #include "appwindow.h" #include +#ifdef Q_OS_UNIX #include +#endif static QApplication *app; static AppWindow *window; -void sig_handler(int s) { +#ifdef Q_OS_UNIX +static void tryExitGracefully(int s) { Q_UNUSED(s) window->close(); app->quit(); } +#endif int main(int argc, char *argv[]) { app = new QApplication(argc, argv); @@ -18,7 +22,10 @@ int main(int argc, char *argv[]) { window = new AppWindow; QCoreApplication::setApplicationVersion(window->getAppVersion() + "-" + window->getAppGitHash().left(9)); - signal(SIGINT, sig_handler); + +#ifdef Q_OS_UNIX + signal(SIGINT, tryExitGracefully); +#endif auto rc = app->exec(); return rc; }