CMakeProcess: Do some cleanup

1. Get rid of unused started() signal.
2. Remove lastExitCode() getter.
3. Add int exitCode arg to finished() signal.
4. Make some string variables const.

Change-Id: I3e9774f64a8f34fd2be4436d766285cad1c539a3
Reviewed-by: hjk <hjk@qt.io>

src/plugins/cmakeprojectmanager/cmakeprocess.cpp

@@ -36,6 +36,8 @@ CMakeProcess::~CMakeProcess()
     m_parser.flush();
 }
 
+static const int failedToStartExitCode = 0xFF; // See QtcProcessPrivate::handleDone() impl
+
 void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &arguments)
 {
     QTC_ASSERT(!m_process, return);
@@ -46,20 +48,20 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
     const FilePath cmakeExecutable = cmake->cmakeExecutable();
 
     if (!cmakeExecutable.ensureReachable(parameters.sourceDirectory)) {
-        QString msg = ::CMakeProjectManager::Tr::tr(
+        const QString msg = ::CMakeProjectManager::Tr::tr(
                 "The source directory %1 is not reachable by the CMake executable %2.")
             .arg(parameters.sourceDirectory.displayName()).arg(cmakeExecutable.displayName());
         BuildSystem::appendBuildSystemOutput(msg + '\n');
-        emit finished();
+        emit finished(failedToStartExitCode);
         return;
     }
 
     if (!cmakeExecutable.ensureReachable(parameters.buildDirectory)) {
-        QString msg = ::CMakeProjectManager::Tr::tr(
+        const QString msg = ::CMakeProjectManager::Tr::tr(
                 "The build directory %1 is not reachable by the CMake executable %2.")
             .arg(parameters.buildDirectory.displayName()).arg(cmakeExecutable.displayName());
         BuildSystem::appendBuildSystemOutput(msg + '\n');
-        emit finished();
+        emit finished(failedToStartExitCode);
         return;
     }
 
@@ -67,21 +69,20 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
     const FilePath buildDirectory = parameters.buildDirectory.onDevice(cmakeExecutable);
 
     if (!buildDirectory.exists()) {
-        QString msg = ::CMakeProjectManager::Tr::tr( "The build directory \"%1\" does not exist")
+        const QString msg = ::CMakeProjectManager::Tr::tr(
-                          .arg(buildDirectory.toUserOutput());
+                "The build directory \"%1\" does not exist").arg(buildDirectory.toUserOutput());
         BuildSystem::appendBuildSystemOutput(msg + '\n');
-        emit finished();
+        emit finished(failedToStartExitCode);
         return;
     }
 
     if (buildDirectory.needsDevice()) {
         if (cmake->cmakeExecutable().host() != buildDirectory.host()) {
-            QString msg = ::CMakeProjectManager::Tr::tr("CMake executable \"%1\" and build directory "
+            const QString msg = ::CMakeProjectManager::Tr::tr(
-                                                        "\"%2\" must be on the same device.")
+                  "CMake executable \"%1\" and build directory \"%2\" must be on the same device.")
-                              .arg(cmake->cmakeExecutable().toUserOutput(),
+                    .arg(cmake->cmakeExecutable().toUserOutput(), buildDirectory.toUserOutput());
-                                   buildDirectory.toUserOutput());
             BuildSystem::appendBuildSystemOutput(msg + '\n');
-            emit finished();
+            emit finished(failedToStartExitCode);
             return;
         }
     }
@@ -125,7 +126,6 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
                              .arg(parameters.projectName));
     m_process->setTimeoutS(10); // for process progress timeout estimation
     m_process->setCommand(commandLine);
-    emit started();
     m_elapsed.start();
     m_process->start();
 }
@@ -139,7 +139,6 @@ void CMakeProcess::stop()
 void CMakeProcess::handleProcessDone(const Utils::ProcessResultData &resultData)
 {
     const int code = resultData.m_exitCode;
-
     QString msg;
     if (resultData.m_error == QProcess::FailedToStart) {
         msg = ::CMakeProjectManager::Tr::tr("CMake process failed to start.");
@@ -149,16 +148,15 @@ void CMakeProcess::handleProcessDone(const Utils::ProcessResultData &resultData)
         else
             msg = ::CMakeProjectManager::Tr::tr("CMake process crashed.");
     } else if (code != 0) {
-        msg = ::CMakeProjectManager::Tr::tr("CMake process exited with exit code %1.") .arg(code);
+        msg = ::CMakeProjectManager::Tr::tr("CMake process exited with exit code %1.").arg(code);
     }
-    m_lastExitCode = code;
 
     if (!msg.isEmpty()) {
         BuildSystem::appendBuildSystemOutput(msg + '\n');
         TaskHub::addTask(BuildSystemTask(Task::Error, msg));
     }
 
-    emit finished();
+    emit finished(code);
 
     const QString elapsedTime = Utils::formatElapsedTime(m_elapsed.elapsed());
     BuildSystem::appendBuildSystemOutput(elapsedTime + '\n');

src/plugins/cmakeprojectmanager/cmakeprocess.h

@@ -31,11 +31,8 @@ public:
     void run(const BuildDirParameters &parameters, const QStringList &arguments);
     void stop();
 
-    int lastExitCode() const { return m_lastExitCode; }
-
 signals:
-    void started();
+    void finished(int exitCode);
-    void finished();
 
 private:
     void handleProcessDone(const Utils::ProcessResultData &resultData);
@@ -43,7 +40,6 @@ private:
     std::unique_ptr<Utils::QtcProcess> m_process;
     Utils::OutputFormatter m_parser;
     QElapsedTimer m_elapsed;
-    int m_lastExitCode = 0;
 };
 
 } // CMakeProjectManager::Internal

src/plugins/cmakeprojectmanager/fileapireader.cpp

@@ -350,11 +350,11 @@ void FileApiReader::startCMakeState(const QStringList &configurationArguments)
     m_cmakeProcess->run(m_parameters, configurationArguments);
 }
 
-void FileApiReader::cmakeFinishedState()
+void FileApiReader::cmakeFinishedState(int exitCode)
 {
     qCDebug(cmakeFileApiMode) << "FileApiReader: CMAKE FINISHED STATE.";
 
-    m_lastCMakeExitCode = m_cmakeProcess->lastExitCode();
+    m_lastCMakeExitCode = exitCode;
     m_cmakeProcess.release()->deleteLater();
 
     if (m_lastCMakeExitCode != 0)

src/plugins/cmakeprojectmanager/fileapireader.h

@@ -69,7 +69,7 @@ private:
     void startState();
     void endState(const Utils::FilePath &replyFilePath, bool restoredFromBackup);
     void startCMakeState(const QStringList &configurationArguments);
-    void cmakeFinishedState();
+    void cmakeFinishedState(int exitCode);
 
     void replyDirectoryHasChanged(const QString &directory) const;
     void makeBackupConfiguration(bool store);