diff options
author | Christiaan Janssen <christiaan.janssen@digia.com> | 2013-08-08 13:28:08 +0200 |
---|---|---|
committer | Christiaan Janssen <christiaan.janssen@digia.com> | 2013-08-09 17:19:32 +0200 |
commit | 0a3b20f5f99bec75b590aa81ae26aac046efd794 (patch) | |
tree | 13cdc00fe9b5a3e5c91cba19950ff4d788ee42f8 /src/plugins/qmlprofiler/qmlprofilerstatemanager.cpp | |
parent | 7764f35107e901e74458847315ffd114199ce26c (diff) |
QmlProfiler: reworked
Change-Id: I66a236a024d76e7bef6edfb91ae30b5dd098b76b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilerstatemanager.cpp')
-rw-r--r-- | src/plugins/qmlprofiler/qmlprofilerstatemanager.cpp | 100 |
1 files changed, 56 insertions, 44 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerstatemanager.cpp b/src/plugins/qmlprofiler/qmlprofilerstatemanager.cpp index 25ec6c57893..953ed9852fa 100644 --- a/src/plugins/qmlprofiler/qmlprofilerstatemanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerstatemanager.cpp @@ -38,8 +38,7 @@ namespace QmlProfiler { namespace Internal { -static QString stringForState(int state) -{ +inline QString stringForState(int state) { switch (state) { case QmlProfilerStateManager::Idle: return QLatin1String("Idle"); case QmlProfilerStateManager::AppStarting: return QLatin1String("AppStarting"); @@ -54,79 +53,92 @@ static QString stringForState(int state) return QString(); } +class QmlProfilerStateManager::QmlProfilerStateManagerPrivate +{ +public: + QmlProfilerStateManagerPrivate(QmlProfilerStateManager *qq) : q(qq) {} + ~QmlProfilerStateManagerPrivate() {} + + QmlProfilerStateManager *q; + + QmlProfilerStateManager::QmlProfilerState m_currentState; + bool m_clientRecording; + bool m_serverRecording; +}; QmlProfilerStateManager::QmlProfilerStateManager(QObject *parent) : - QObject(parent) + QObject(parent),d(new QmlProfilerStateManagerPrivate(this)) { - m_currentState = Idle; - m_clientRecording = true; - m_serverRecording = false; + d->m_currentState = Idle; + d->m_clientRecording = true; + d->m_serverRecording = false; } QmlProfilerStateManager::~QmlProfilerStateManager() { + delete d; } -QmlProfilerStateManager::QmlProfilerState QmlProfilerStateManager::currentState() const +QmlProfilerStateManager::QmlProfilerState QmlProfilerStateManager::currentState() { - return m_currentState; + return d->m_currentState; } -bool QmlProfilerStateManager::clientRecording() const +bool QmlProfilerStateManager::clientRecording() { - return m_clientRecording; + return d->m_clientRecording; } -bool QmlProfilerStateManager::serverRecording() const +bool QmlProfilerStateManager::serverRecording() { - return m_serverRecording; + return d->m_serverRecording; } -QString QmlProfilerStateManager::currentStateAsString() const +QString QmlProfilerStateManager::currentStateAsString() { - return stringForState(m_currentState); + return stringForState(d->m_currentState); } void QmlProfilerStateManager::setCurrentState(QmlProfilerState newState) { #ifdef _DEBUG_PROFILERSTATE_ - qDebug() << "Profiler state change request from" << currentStateAsString() << "to" << stringForState(newState); + qDebug() << "Profiler state change request from" << stringForState(d->m_currentState) << "to" << stringForState(newState); #endif - QTC_ASSERT(m_currentState != newState, /**/); + QTC_ASSERT(d->m_currentState != newState, /**/); switch (newState) { case Idle: - QTC_ASSERT(m_currentState == AppStarting || - m_currentState == AppStopped || - m_currentState == AppKilled, - qDebug() << "from" << currentStateAsString()); + 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(m_currentState == Idle, - qDebug() << "from" << currentStateAsString()); + QTC_ASSERT(d->m_currentState == Idle, + qDebug() << "from" << stringForState(d->m_currentState)); break; case AppRunning: - QTC_ASSERT(m_currentState == AppStarting, - qDebug() << "from" << currentStateAsString()); + QTC_ASSERT(d->m_currentState == AppStarting, + qDebug() << "from" << stringForState(d->m_currentState)); break; case AppStopRequested: - QTC_ASSERT(m_currentState == AppRunning, - qDebug() << "from" << currentStateAsString()); + QTC_ASSERT(d->m_currentState == AppRunning, + qDebug() << "from" << stringForState(d->m_currentState)); break; case AppReadyToStop: - QTC_ASSERT(m_currentState == AppStopRequested, - qDebug() << "from" << currentStateAsString()); + QTC_ASSERT(d->m_currentState == AppStopRequested, + qDebug() << "from" << stringForState(d->m_currentState)); break; case AppStopped: - QTC_ASSERT(m_currentState == AppReadyToStop || - m_currentState == AppDying, - qDebug() << "from" << currentStateAsString()); + QTC_ASSERT(d->m_currentState == AppReadyToStop || + d->m_currentState == AppDying, + qDebug() << "from" << stringForState(d->m_currentState)); break; case AppDying: - QTC_ASSERT(m_currentState == AppRunning, - qDebug() << "from" << currentStateAsString()); + QTC_ASSERT(d->m_currentState == AppRunning, + qDebug() << "from" << stringForState(d->m_currentState)); break; case AppKilled: - QTC_ASSERT(m_currentState == AppDying, - qDebug() << "from" << currentStateAsString()); + 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__)); @@ -135,17 +147,17 @@ void QmlProfilerStateManager::setCurrentState(QmlProfilerState newState) break; } - m_currentState = newState; + d->m_currentState = newState; emit stateChanged(); } void QmlProfilerStateManager::setClientRecording(bool recording) { #ifdef _DEBUG_PROFILERSTATE_ - qDebug() << "Setting client recording flag from" << m_serverRecording << "to" << recording; + qDebug() << "Setting client recording flag from" << d->m_serverRecording << "to" << recording; #endif - if (m_clientRecording != recording) { - m_clientRecording = recording; + if (d->m_clientRecording != recording) { + d->m_clientRecording = recording; emit clientRecordingChanged(); } } @@ -153,13 +165,13 @@ void QmlProfilerStateManager::setClientRecording(bool recording) void QmlProfilerStateManager::setServerRecording(bool recording) { #ifdef _DEBUG_PROFILERSTATE_ - qDebug() << "Setting server recording flag from" << m_serverRecording << "to" << recording; + qDebug() << "Setting server recording flag from" << d->m_serverRecording << "to" << recording; #endif - if (m_serverRecording != recording) { - m_serverRecording = recording; + if (d->m_serverRecording != recording) { + d->m_serverRecording = recording; emit serverRecordingChanged(); } } -} // namespace Internal -} // namespace QmlProfiler +} +} |