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 <[email protected]>
Reviewed-by: hjk <[email protected]>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index d0e53fe70c7..ac94225b88a 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -336,15 +336,14 @@ void BreakHandler::saveBreakpoints()
             map.insert(_("message"), data.message);
         list.append(map);
     }
-    DebuggerCore::setSessionValue("Breakpoints", list);
+    setSessionValue("Breakpoints", list);
     //qDebug() << "SAVED BREAKPOINTS" << this << list.size();
 }
 
 void BreakHandler::loadBreakpoints()
 {
-    QTC_ASSERT(debuggerCore(), return);
     //qDebug() << "LOADING BREAKPOINTS...";
-    QVariant value = DebuggerCore::sessionValue("Breakpoints");
+    QVariant value = sessionValue("Breakpoints");
     QList<QVariant> list = value.toList();
     //clear();
     foreach (const QVariant &var, list) {
@@ -686,7 +685,7 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const
     }
     switch (role) {
     case Qt::ToolTipRole:
-        if (debuggerCore()->boolSetting(UseToolTipsInBreakpointsView))
+        if (boolSetting(UseToolTipsInBreakpointsView))
                 return QVariant(it->toToolTip());
         break;
     }
@@ -1217,7 +1216,7 @@ void BreakHandler::gotoLocation(BreakpointModelId id) const
 {
     ConstIterator it = m_storage.find(id);
     BREAK_ASSERT(it != m_storage.end(), return);
-    DebuggerEngine *engine = debuggerCore()->currentEngine();
+    DebuggerEngine *engine = currentEngine();
     if (it->data.type == BreakpointByAddress) {
         if (engine)
             engine->gotoLocation(it->data.address);