From 6f0303206e38c2a75afa6aa401590b4648dc5004 Mon Sep 17 00:00:00 2001 From: Vitalya Date: Thu, 27 Apr 2023 17:21:03 +0300 Subject: [PATCH] Move two functions into separate file --- CMakeLists.txt | 1 + src/main.cpp | 22 +--------------------- src/utils.cpp | 22 ++++++++++++++++++++++ src/utils.h | 10 ++++++++++ 4 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 src/utils.cpp create mode 100644 src/utils.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 48544ac..49ae026 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,6 +45,7 @@ set(discord-screenaudio_SRC src/log.cpp src/userscript.cpp src/centralwidget.cpp + src/utils.cpp resources.qrc ) diff --git a/src/main.cpp b/src/main.cpp index 14fddb3..9cd4914 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,6 @@ #include "mainwindow.h" #include "virtmic.h" +#include "utils.h" #ifdef KXMLGUI #include @@ -12,27 +13,6 @@ #include #include -void showErrorMessage(const char *text) { - QMessageBox msgBox; - - msgBox.setIcon(QMessageBox::Critical); - msgBox.setText(text); - msgBox.setStandardButtons(QMessageBox::Ok); - msgBox.setDefaultButton(QMessageBox::Ok); - msgBox.setWindowIcon(QIcon(":assets/de.shorsh.discord-screenaudio.png")); - - msgBox.exec(); -} - -bool isProgramRunning(const QString &program_name) { - QLocalSocket socket; - socket.connectToServer(program_name); - if (socket.waitForConnected()) { - return true; // program is already running - } - return false; -} - int main(int argc, char *argv[]) { QApplication app(argc, argv); diff --git a/src/utils.cpp b/src/utils.cpp new file mode 100644 index 0000000..3efa9ad --- /dev/null +++ b/src/utils.cpp @@ -0,0 +1,22 @@ +#include "utils.h" + +bool isProgramRunning(const QString &program_name) { + QLocalSocket socket; + socket.connectToServer(program_name); + if (socket.waitForConnected()) { + return true; // program is already running + } + return false; +} + +void showErrorMessage(const char *text) { + QMessageBox msgBox; + + msgBox.setIcon(QMessageBox::Critical); + msgBox.setText(text); + msgBox.setStandardButtons(QMessageBox::Ok); + msgBox.setDefaultButton(QMessageBox::Ok); + msgBox.setWindowIcon(QIcon(":assets/de.shorsh.discord-screenaudio.png")); + + msgBox.exec(); +} diff --git a/src/utils.h b/src/utils.h new file mode 100644 index 0000000..40e3568 --- /dev/null +++ b/src/utils.h @@ -0,0 +1,10 @@ +#pragma once +#include "mainwindow.h" + +#include +#include +#include + + +bool isProgramRunning(const QString &program_name); +void showErrorMessage(const char *text);