s/ProcessKilled/ProcessFailed

Change-Id: I89cb60a0853eb0f8cee59053ebc8055c02eae94c
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>

4 files changed, 6 insertions, 6 deletions

diff --git a/src/modules/Unity/Application/application.cpp b/src/modules/Unity/Application/application.cpp
index 18fdaf2..ae96d1e 100644
--- a/src/modules/Unity/Application/application.cpp
+++ b/src/modules/Unity/Application/application.cpp
@@ -527,7 +527,7 @@ void Application::setProcessState(ProcessState newProcessState)
         Q_ASSERT(m_state == InternalState::SuspendingWaitProcess);
         setInternalState(InternalState::Suspended);
         break;
-    case ProcessKilled:
+    case ProcessFailed:
         // we assume the session always stop before the process
         Q_ASSERT(!m_session || m_session->state() == Session::Stopped);
 
diff --git a/src/modules/Unity/Application/application.h b/src/modules/Unity/Application/application.h
index a5069ba..957ce70 100644
--- a/src/modules/Unity/Application/application.h
+++ b/src/modules/Unity/Application/application.h
@@ -61,7 +61,7 @@ public:
         ProcessUnknown,
         ProcessRunning,
         ProcessSuspended,
-        ProcessKilled, // it stopped, but because it was killed.
+        ProcessFailed, // it stopped, but because it was killed or because it crashed
         ProcessStopped
     };
 
diff --git a/src/modules/Unity/Application/application_manager.cpp b/src/modules/Unity/Application/application_manager.cpp
index 1aa5b82..249a4c0 100644
--- a/src/modules/Unity/Application/application_manager.cpp
+++ b/src/modules/Unity/Application/application_manager.cpp
@@ -465,7 +465,7 @@ void ApplicationManager::onProcessFailed(const QString &appId, const bool during
     }
 
     Q_UNUSED(duringStartup); // FIXME(greyback) upstart reports app that fully started up & crashes as failing during startup??
-    application->setProcessState(Application::ProcessKilled);
+    application->setProcessState(Application::ProcessFailed);
     application->setPid(0);
 }
 
@@ -483,7 +483,7 @@ void ApplicationManager::onProcessStopped(const QString &appId)
 
     // if an application gets killed, onProcessFailed is called first, followed by onProcessStopped.
     // we don't want to override what onProcessFailed already set.
-    if (application->processState() != Application::ProcessKilled) {
+    if (application->processState() != Application::ProcessFailed) {
         application->setProcessState(Application::ProcessStopped);
         application->setPid(0);
     }
diff --git a/tests/modules/Application/application_test.cpp b/tests/modules/Application/application_test.cpp
index 1c4adf1..45a9909 100644
--- a/tests/modules/Application/application_test.cpp
+++ b/tests/modules/Application/application_test.cpp
@@ -118,7 +118,7 @@ TEST_F(ApplicationTests, checkRespawnAcquiresWakeLock)
     application->setProcessState(Application::ProcessSuspended);
     ASSERT_EQ(Application::InternalState::Suspended, application->internalState());
     session->setState(SessionInterface::Stopped);
-    application->setProcessState(Application::ProcessKilled);
+    application->setProcessState(Application::ProcessFailed);
     ASSERT_EQ(Application::InternalState::StoppedResumable, application->internalState());
 
     EXPECT_FALSE(sharedWakelock.enabled());
@@ -280,7 +280,7 @@ TEST_F(ApplicationTests, doesNotEmitStoppedWhenKilledWhileSuspended)
 
     session->setState(SessionInterface::Stopped);
 
-    application->setProcessState(Application::ProcessKilled);
+    application->setProcessState(Application::ProcessFailed);
 
     ASSERT_EQ(Application::InternalState::StoppedResumable, application->internalState());