debugger: watcher creation revisited

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);
 

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;

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;