From ac6809d40f653f70e681bb2797014fce088e4409 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Wed, 5 Feb 2025 17:57:04 +0000 Subject: [PATCH] refactor: Rename core process start/stop function names --- src/lib/gui/core/CoreProcess.cpp | 16 ++++++++-------- src/lib/gui/core/CoreProcess.h | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lib/gui/core/CoreProcess.cpp b/src/lib/gui/core/CoreProcess.cpp index dbfae062c..4b9b1d197 100644 --- a/src/lib/gui/core/CoreProcess.cpp +++ b/src/lib/gui/core/CoreProcess.cpp @@ -259,7 +259,7 @@ void CoreProcess::onProcessFinished(int exitCode, QProcess::ExitStatus) } } -void CoreProcess::startDesktop(const QString &app, const QStringList &args) +void CoreProcess::startForegroundProcess(const QString &app, const QStringList &args) { using enum ProcessState; @@ -282,7 +282,7 @@ void CoreProcess::startDesktop(const QString &app, const QStringList &args) } } -void CoreProcess::startService(const QString &app, const QStringList &args) +void CoreProcess::startProcessFromDaemon(const QString &app, const QStringList &args) { using enum ProcessState; @@ -304,7 +304,7 @@ void CoreProcess::startService(const QString &app, const QStringList &args) setProcessState(Started); } -void CoreProcess::stopDesktop() const +void CoreProcess::stopForegroundProcess() const { if (m_processState != ProcessState::Stopping) { qFatal("core process must be in stopping state"); @@ -324,7 +324,7 @@ void CoreProcess::stopDesktop() const } } -void CoreProcess::stopService() +void CoreProcess::stopProcessFromDaemon() { if (m_processState != ProcessState::Stopping) { qFatal("core process must be in stopping state"); @@ -409,9 +409,9 @@ void CoreProcess::start(std::optional processModeOption) qInfo("log file: %s", qPrintable(m_appConfig.logFilename())); if (processMode == ProcessMode::kDesktop) { - startDesktop(app, args); + startForegroundProcess(app, args); } else if (processMode == ProcessMode::kService) { - startService(app, args); + startProcessFromDaemon(app, args); } m_lastProcessMode = processMode; @@ -432,9 +432,9 @@ void CoreProcess::stop(std::optional processModeOption) setProcessState(ProcessState::Stopping); if (processMode == ProcessMode::kService) { - stopService(); + stopProcessFromDaemon(); } else if (processMode == ProcessMode::kDesktop) { - stopDesktop(); + stopForegroundProcess(); } } else { diff --git a/src/lib/gui/core/CoreProcess.h b/src/lib/gui/core/CoreProcess.h index 67d9f8821..7a1db3cf5 100644 --- a/src/lib/gui/core/CoreProcess.h +++ b/src/lib/gui/core/CoreProcess.h @@ -136,10 +136,10 @@ private slots: void onProcessReadyReadStandardError(); private: - void startDesktop(const QString &app, const QStringList &args); - void startService(const QString &app, const QStringList &args); - void stopDesktop() const; - void stopService(); + void startForegroundProcess(const QString &app, const QStringList &args); + void startProcessFromDaemon(const QString &app, const QStringList &args); + void stopForegroundProcess() const; + void stopProcessFromDaemon(); bool addGenericArgs(QStringList &args, const ProcessMode processMode) const; bool addServerArgs(QStringList &args, QString &app); bool addClientArgs(QStringList &args, QString &app);