From 5b0bf616401624e28ba1c0e94e474c2da2e6350a Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 17 Apr 2012 08:01:25 +0200 Subject: 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 --- src/plugins/valgrind/callgrind/callgrindcontroller.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/plugins/valgrind/callgrind/callgrindcontroller.cpp') 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(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)); -- cgit v1.2.1