diff options
author | Daniel d'Andrada <daniel.dandrada@canonical.com> | 2015-08-20 13:04:25 -0300 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-08-26 11:47:37 +0000 |
commit | fd47cafb3031a3533ed10cabb8dec824413e79af (patch) | |
tree | 0ab495442c102b34c3e86285f654acb15b77c16e /src | |
parent | 8464c06dcd08be9a7bf74b8812a1953b510d6e73 (diff) |
s/ProcessKilled/ProcessFailed
Change-Id: I89cb60a0853eb0f8cee59053ebc8055c02eae94c
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/modules/Unity/Application/application.cpp | 2 | ||||
-rw-r--r-- | src/modules/Unity/Application/application.h | 2 | ||||
-rw-r--r-- | src/modules/Unity/Application/application_manager.cpp | 4 |
3 files changed, 4 insertions, 4 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); } |