feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Simplify CMakeProcess::finished signature

Browse Source 
The parameters were never used, and start to look alien in the
presence of QtcProcess::result().

Change-Id: Ie2d6a051b439b5e9161d565b84efb78dbe17487f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
hjk
2021-06-08 13:40:45 +02:00
parent 904b236e58
commit bc2af18a41
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakeprocess.cpp
View File

@@ -214,7 +214,7 @@ void CMakeProcess::handleProcessFinished(int code, QProcess::ExitStatus status)
m_future->reportFinished(); m_future->reportFinished();
emit finished(code, status); emit finished();
const QString elapsedTime = Utils::formatElapsedTime(m_elapsed.elapsed()); const QString elapsedTime = Utils::formatElapsedTime(m_elapsed.elapsed());
BuildSystem::appendBuildSystemOutput(elapsedTime); BuildSystem::appendBuildSystemOutput(elapsedTime);

5
src/plugins/cmakeprojectmanager/cmakeprocess.h
View File

@@ -41,7 +41,8 @@
namespace CMakeProjectManager { namespace CMakeProjectManager {
namespace Internal { namespace Internal {
class CMakeProcess : public QObject { class CMakeProcess : public QObject
{
Q_OBJECT Q_OBJECT
public: public:
@@ -65,7 +66,7 @@ public:
int lastExitCode() const { return m_lastExitCode; } int lastExitCode() const { return m_lastExitCode; }
signals: signals:
void started(); void started();
void finished(int exitCode, QProcess::ExitStatus exitStatus); void finished();
private: private:
void handleProcessFinished(int code, QProcess::ExitStatus status); void handleProcessFinished(int code, QProcess::ExitStatus status);

5
src/plugins/cmakeprojectmanager/fileapireader.cpp
View File

@@ -376,13 +376,10 @@ void FileApiReader::startCMakeState(const QStringList &configurationArguments)
m_cmakeProcess->run(m_parameters, configurationArguments); m_cmakeProcess->run(m_parameters, configurationArguments);
} }
void FileApiReader::cmakeFinishedState(int code, QProcess::ExitStatus status) void FileApiReader::cmakeFinishedState()
{ {
qCDebug(cmakeFileApiMode) << "FileApiReader: CMAKE FINISHED STATE."; qCDebug(cmakeFileApiMode) << "FileApiReader: CMAKE FINISHED STATE.";
Q_UNUSED(code)
Q_UNUSED(status)
m_lastCMakeExitCode = m_cmakeProcess->lastExitCode(); m_lastCMakeExitCode = m_cmakeProcess->lastExitCode();
m_cmakeProcess.release()->deleteLater(); m_cmakeProcess.release()->deleteLater();

2
src/plugins/cmakeprojectmanager/fileapireader.h
View File

@@ -88,7 +88,7 @@ private:
void startState(); void startState();
void endState(const QFileInfo &replyFi); void endState(const QFileInfo &replyFi);
void startCMakeState(const QStringList &configurationArguments); void startCMakeState(const QStringList &configurationArguments);
void cmakeFinishedState(int code, QProcess::ExitStatus status); void cmakeFinishedState();
void replyDirectoryHasChanged(const QString &directory) const; void replyDirectoryHasChanged(const QString &directory) const;
void makeBackupConfiguration(bool store); void makeBackupConfiguration(bool store);