From 544aea1a2ee5d2476938ab43ee681d90e4cde4ae Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 16 Apr 2009 14:42:19 +0200
Subject: [PATCH] debugger: watcher creation revisited
---
src/plugins/debugger/debuggeractions.cpp | 2 +-
src/plugins/debugger/watchhandler.cpp | 1 -
src/plugins/debugger/watchwindow.cpp | 4 +---
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 43dc44ce7a1..d0a620c16d2 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -158,7 +158,7 @@ DebuggerSettings *DebuggerSettings::instance()
instance->insertItem(UseDebuggingHelpers, item);
item->setDefaultValue(true);
item->setSettingsKey("DebugMode", "UseDebuggingHelper");
- item->setText(tr("Use Debugging Helper"));
+ item->setText(tr("Use debugging helper"));
item->setCheckable(true);
item->setDefaultValue(true);
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 42e42f5f0b6..eea64c4bca0 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -932,7 +932,6 @@ QString WatchHandler::watcherName(const QString &exp)
void WatchHandler::watchExpression(const QString &exp)
{
// FIXME: 'exp' can contain illegal characters
- //MODEL_DEBUG("WATCH: " << exp);
m_watchers[exp] = watcherCounter++;
WatchData data;
data.exp = exp;
diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index f6e2fd01cb8..71ac3bb1e6c 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -96,7 +96,7 @@ public:
} else if (index.column() == 0) {
// the watcher name column
theDebuggerAction(RemoveWatchExpression)->trigger(exp);
- theDebuggerAction(WatchExpression)->trigger(lineEdit->text());
+ theDebuggerAction(WatchExpression)->trigger(value);
}
}
@@ -175,8 +175,6 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
QModelIndex idx = indexAt(ev->pos());
QModelIndex mi0 = idx.sibling(idx.row(), 0);
QString exp = model()->data(mi0).toString();
- QModelIndex mi1 = idx.sibling(idx.row(), 0);
- QString value = model()->data(mi1).toString();
menu.addSeparator();
int type = (m_type == LocalsType) ? WatchExpression : RemoveWatchExpression;
--
GitLab