Debugger: Reduce line noise

Move some function out of the DebuggerCore "namespace", to avoid one
indirection and removes clutter in the calling code.

Change-Id: I1c870d5c7eeade32fa63dedf581490fbb090cd6a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

1 files changed, 7 insertions, 12 deletions

diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index 9d1097d3bd..b926297a7c 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -86,11 +86,6 @@ namespace Internal {
 
 const char CurrentIndex[] = "CurrentIndex";
 
-static DebuggerEngine *currentEngine()
-{
-    return debuggerCore()->currentEngine();
-}
-
 class WatchDelegate : public QItemDelegate
 {
 public:
@@ -912,15 +907,15 @@ void WatchTreeView::contextMenuEvent(QContextMenuEvent *ev)
     menu.addAction(&actShowInEditor);
     menu.addSeparator();
 
-    menu.addAction(debuggerCore()->action(UseDebuggingHelpers));
-    menu.addAction(debuggerCore()->action(UseToolTipsInLocalsView));
-    menu.addAction(debuggerCore()->action(AutoDerefPointers));
-    menu.addAction(debuggerCore()->action(SortStructMembers));
-    menu.addAction(debuggerCore()->action(UseDynamicType));
-    menu.addAction(debuggerCore()->action(SettingsDialog));
+    menu.addAction(action(UseDebuggingHelpers));
+    menu.addAction(action(UseToolTipsInLocalsView));
+    menu.addAction(action(AutoDerefPointers));
+    menu.addAction(action(SortStructMembers));
+    menu.addAction(action(UseDynamicType));
+    menu.addAction(action(SettingsDialog));
 
     menu.addSeparator();
-    menu.addAction(debuggerCore()->action(SettingsDialog));
+    menu.addAction(action(SettingsDialog));
 
     QAction *act = menu.exec(ev->globalPos());