diff options
author | hjk <qtc-committer@nokia.com> | 2012-04-17 08:01:25 +0200 |
---|---|---|
committer | hjk <qthjk@ovi.com> | 2012-04-17 09:53:44 +0200 |
commit | 5b0bf616401624e28ba1c0e94e474c2da2e6350a (patch) | |
tree | 661e3e7490e2f8b718c77f03f37bccb806ed7b18 /src/plugins/valgrind/callgrind/callgrindcontroller.cpp | |
parent | 37e38530905b31607d07bea1ca65618d95c8f380 (diff) | |
download | qt-creator-5b0bf616401624e28ba1c0e94e474c2da2e6350a.tar.gz |
qtcassert: move actual printing to separate function and enforce style
This also allows simple setting of breakpoints on failed asserts.
Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/valgrind/callgrind/callgrindcontroller.cpp')
-rw-r--r-- | src/plugins/valgrind/callgrind/callgrindcontroller.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp index f3281fed4b..ea765081bf 100644 --- a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp +++ b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp @@ -94,14 +94,13 @@ QString toOptionString(CallgrindController::Option option) } } - void CallgrindController::run(Option option) { if (m_process) { emit statusMessage(tr("Previous command has not yet finished.")); return; } - QTC_ASSERT(m_valgrindProc, return) + QTC_ASSERT(m_valgrindProc, return); if (RemoteValgrindProcess *remote = qobject_cast<RemoteValgrindProcess *>(m_valgrindProc)) m_process = new RemoteValgrindProcess(remote->connection(), this); @@ -150,7 +149,7 @@ void CallgrindController::run(Option option) void CallgrindController::processError(QProcess::ProcessError) { - QTC_ASSERT(m_process, return) + QTC_ASSERT(m_process, return); const QString error = m_process->errorString(); emit statusMessage(QString("An error occurred while trying to run %1: %2").arg(CALLGRIND_CONTROL_BINARY).arg(error)); |