From 82e0eefc8ded4beed0d82b6bb25de9e9ce69e613 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 5 Oct 2017 08:42:29 +0200 Subject: [PATCH] Debugger: Move static type related code to CdbEngine constructor Change-Id: I5d5489030eab9c16385df9af15f5974eaa2190e0 Reviewed-by: hjk --- src/plugins/debugger/cdb/cdbengine.cpp | 34 +++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index a50fa1f7ca1..20c6fcbc697 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -216,6 +216,23 @@ CdbEngine::CdbEngine() : { setObjectName("CdbEngine"); + DisplayFormats stringFormats; + stringFormats.append(SimpleFormat); + stringFormats.append(SeparateFormat); + + WatchHandler *wh = watchHandler(); + wh->addTypeFormats("QString", stringFormats); + wh->addTypeFormats("QString *", stringFormats); + wh->addTypeFormats("QByteArray", stringFormats); + wh->addTypeFormats("QByteArray *", stringFormats); + wh->addTypeFormats("std__basic_string", stringFormats); // Python dumper naming convention for std::[w]string + + DisplayFormats imageFormats; + imageFormats.append(SimpleFormat); + imageFormats.append(EnhancedFormat); + wh->addTypeFormats("QImage", imageFormats); + wh->addTypeFormats("QImage *", imageFormats); + connect(action(OperateByInstruction), &QAction::triggered, this, &CdbEngine::operateByInstructionTriggered); connect(action(CreateFullBacktrace), &QAction::triggered, @@ -451,23 +468,6 @@ void CdbEngine::setupEngine() STATE_DEBUG(state(), Q_FUNC_INFO, __LINE__, "notifyEngineSetupFailed") notifyEngineSetupFailed(); } - - DisplayFormats stringFormats; - stringFormats.append(SimpleFormat); - stringFormats.append(SeparateFormat); - - WatchHandler *wh = watchHandler(); - wh->addTypeFormats("QString", stringFormats); - wh->addTypeFormats("QString *", stringFormats); - wh->addTypeFormats("QByteArray", stringFormats); - wh->addTypeFormats("QByteArray *", stringFormats); - wh->addTypeFormats("std__basic_string", stringFormats); // Python dumper naming convention for std::[w]string - - DisplayFormats imageFormats; - imageFormats.append(SimpleFormat); - imageFormats.append(EnhancedFormat); - wh->addTypeFormats("QImage", imageFormats); - wh->addTypeFormats("QImage *", imageFormats); } bool CdbEngine::launchCDB(const DebuggerRunParameters &sp, QString *errorMessage)