From f6ffd2b1ae0b0e38302499c608d9a03b9ce5dc82 Mon Sep 17 00:00:00 2001 From: hjk Date: Sat, 10 Aug 2013 21:22:02 +0200 Subject: [PATCH] Debugger: Disable # characters in watched expression They are not useful and break the dumper protocol. Change-Id: Ice7e21575e371ee3f8bb8cfb80b73aed47542932 Reviewed-by: David Schulz Reviewed-by: Kai Koehne --- src/plugins/debugger/watchhandler.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index 0616add575f..45e109aad9b 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -1562,14 +1562,18 @@ QByteArray WatchHandler::watcherName(const QByteArray &exp) return "watch." + QByteArray::number(theWatcherNames[exp]); } -void WatchHandler::watchExpression(const QString &exp, const QString &name) +void WatchHandler::watchExpression(const QString &exp0, const QString &name) { + QString exp = exp0; + QTC_ASSERT(m_engine, return); // Do not insert the same entry more then once. if (theWatcherNames.value(exp.toLatin1())) return; // FIXME: 'exp' can contain illegal characters + exp.replace(QLatin1Char('#'), QString()); + WatchData data; data.exp = exp.toLatin1(); data.name = name.isEmpty() ? exp : name;