From bc2af18a41475f9adfc9906cdb859315004fb126 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 8 Jun 2021 13:40:45 +0200 Subject: [PATCH] CMake: Simplify CMakeProcess::finished signature The parameters were never used, and start to look alien in the presence of QtcProcess::result(). Change-Id: Ie2d6a051b439b5e9161d565b84efb78dbe17487f Reviewed-by: Cristian Adam --- src/plugins/cmakeprojectmanager/cmakeprocess.cpp | 2 +- src/plugins/cmakeprojectmanager/cmakeprocess.h | 5 +++-- src/plugins/cmakeprojectmanager/fileapireader.cpp | 5 +---- src/plugins/cmakeprojectmanager/fileapireader.h | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp index 3e7585f56d7..fdbb7994d9d 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp @@ -214,7 +214,7 @@ void CMakeProcess::handleProcessFinished(int code, QProcess::ExitStatus status) m_future->reportFinished(); - emit finished(code, status); + emit finished(); const QString elapsedTime = Utils::formatElapsedTime(m_elapsed.elapsed()); BuildSystem::appendBuildSystemOutput(elapsedTime); diff --git a/src/plugins/cmakeprojectmanager/cmakeprocess.h b/src/plugins/cmakeprojectmanager/cmakeprocess.h index 9dcc8bfa9a0..f6741474eac 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprocess.h +++ b/src/plugins/cmakeprojectmanager/cmakeprocess.h @@ -41,7 +41,8 @@ namespace CMakeProjectManager { namespace Internal { -class CMakeProcess : public QObject { +class CMakeProcess : public QObject +{ Q_OBJECT public: @@ -65,7 +66,7 @@ public: int lastExitCode() const { return m_lastExitCode; } signals: void started(); - void finished(int exitCode, QProcess::ExitStatus exitStatus); + void finished(); private: void handleProcessFinished(int code, QProcess::ExitStatus status); diff --git a/src/plugins/cmakeprojectmanager/fileapireader.cpp b/src/plugins/cmakeprojectmanager/fileapireader.cpp index 1171b9d5480..e0a6b2edc6e 100644 --- a/src/plugins/cmakeprojectmanager/fileapireader.cpp +++ b/src/plugins/cmakeprojectmanager/fileapireader.cpp @@ -376,13 +376,10 @@ void FileApiReader::startCMakeState(const QStringList &configurationArguments) m_cmakeProcess->run(m_parameters, configurationArguments); } -void FileApiReader::cmakeFinishedState(int code, QProcess::ExitStatus status) +void FileApiReader::cmakeFinishedState() { qCDebug(cmakeFileApiMode) << "FileApiReader: CMAKE FINISHED STATE."; - Q_UNUSED(code) - Q_UNUSED(status) - m_lastCMakeExitCode = m_cmakeProcess->lastExitCode(); m_cmakeProcess.release()->deleteLater(); diff --git a/src/plugins/cmakeprojectmanager/fileapireader.h b/src/plugins/cmakeprojectmanager/fileapireader.h index 1a7d7dc3d38..62bcb3012ab 100644 --- a/src/plugins/cmakeprojectmanager/fileapireader.h +++ b/src/plugins/cmakeprojectmanager/fileapireader.h @@ -88,7 +88,7 @@ private: void startState(); void endState(const QFileInfo &replyFi); void startCMakeState(const QStringList &configurationArguments); - void cmakeFinishedState(int code, QProcess::ExitStatus status); + void cmakeFinishedState(); void replyDirectoryHasChanged(const QString &directory) const; void makeBackupConfiguration(bool store);