QmlProfiler: Simplify application state handling

Only half of the states are useful for anything.

Change-Id: I4591ccda6eec902e929e07947bad6c3f7b967ef9
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 3 insertions, 25 deletions

diff --git a/src/plugins/qmlprofiler/qmlprofilerstatemanager.cpp b/src/plugins/qmlprofiler/qmlprofilerstatemanager.cpp
index 09e0e6b8d65..f01aab6dca2 100644
--- a/src/plugins/qmlprofiler/qmlprofilerstatemanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerstatemanager.cpp
@@ -41,13 +41,9 @@ namespace QmlProfiler {
 inline QString stringForState(int state) {
     switch (state) {
     case QmlProfilerStateManager::Idle: return QLatin1String("Idle");
-    case QmlProfilerStateManager::AppStarting: return QLatin1String("AppStarting");
     case QmlProfilerStateManager::AppRunning: return QLatin1String("AppRunning");
     case QmlProfilerStateManager::AppStopRequested: return QLatin1String("AppStopRequested");
-    case QmlProfilerStateManager::AppReadyToStop: return QLatin1String("AppReadyToStop");
-    case QmlProfilerStateManager::AppStopped: return QLatin1String("AppStopped");
     case QmlProfilerStateManager::AppDying: return QLatin1String("AppDying");
-    case QmlProfilerStateManager::AppKilled: return QLatin1String("AppKilled");
     default: break;
     }
     return QString();
@@ -120,40 +116,22 @@ void QmlProfilerStateManager::setCurrentState(QmlProfilerState newState)
     QTC_ASSERT(d->m_currentState != newState, /**/);
     switch (newState) {
     case Idle:
-        QTC_ASSERT(d->m_currentState == AppStarting ||
-                   d->m_currentState == AppStopped ||
-                   d->m_currentState == AppKilled,
-                   qDebug() << "from" << stringForState(d->m_currentState));
-        break;
-    case AppStarting:
-        QTC_ASSERT(d->m_currentState == Idle,
+        QTC_ASSERT(d->m_currentState == AppStopRequested ||
+                   d->m_currentState == AppDying,
                    qDebug() << "from" << stringForState(d->m_currentState));
         break;
     case AppRunning:
-        QTC_ASSERT(d->m_currentState == AppStarting,
+        QTC_ASSERT(d->m_currentState == Idle,
                    qDebug() << "from" << stringForState(d->m_currentState));
         break;
     case AppStopRequested:
         QTC_ASSERT(d->m_currentState == AppRunning,
                    qDebug() << "from" << stringForState(d->m_currentState));
         break;
-    case AppReadyToStop:
-        QTC_ASSERT(d->m_currentState == AppStopRequested,
-                   qDebug() << "from" << stringForState(d->m_currentState));
-        break;
-    case AppStopped:
-        QTC_ASSERT(d->m_currentState == AppReadyToStop ||
-                   d->m_currentState == AppDying,
-                   qDebug() << "from" << stringForState(d->m_currentState));
-        break;
     case AppDying:
         QTC_ASSERT(d->m_currentState == AppRunning,
                    qDebug() << "from" << stringForState(d->m_currentState));
         break;
-    case AppKilled:
-        QTC_ASSERT(d->m_currentState == AppDying,
-                   qDebug() << "from" << stringForState(d->m_currentState));
-        break;
     default: {
         const QString message = QString::fromLatin1("Switching to unknown state in %1:%2").arg(QString::fromLatin1(__FILE__), QString::number(__LINE__));
         qWarning("%s", qPrintable(message));