Debugger: Consolidate breakpoint search

We already have a concept of Context when action on editor events,
use that directly when searching an (almost) matching breakpoint
instead of translating it into breakpoint manager's interface
language.

This also centralizes the guesswork for non-exact matches in one
place, making it easier to fix currently wrong matches later.

Change-Id: I5579e7e01792d425cad4ccf1dbcbbd1bd56c84ec
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 1 insertions, 8 deletions

diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h
index 118e8ca022..048e2f996a 100644
--- a/src/plugins/debugger/breakhandler.h
+++ b/src/plugins/debugger/breakhandler.h
@@ -78,8 +78,6 @@ public:
     void updateLineNumber(int lineNumber);
     void updateFileName(const Utils::FileName &fileName);
 
-    bool isLocatedAt(const QString &fileName, int lineNumber, bool useMarkerPosition) const;
-
     QString displayName() const;
     QString markerFileName() const;
     QString toolTip() const;
@@ -296,12 +294,7 @@ public:
     static const GlobalBreakpoints globalBreakpoints();
 
     static GlobalBreakpoint createBreakpoint(const BreakpointParameters &data);
-
-    static GlobalBreakpoint findBreakpointByLocation(const ContextData &location);
-    // Find a breakpoint matching approximately the data in needle.
-    static GlobalBreakpoint findSimilarBreakpoint(const BreakpointParameters &needle);
-    static GlobalBreakpoint findWatchpoint(const BreakpointParameters &data);
-    static GlobalBreakpoint findBreakpointByFunction(const QString &functionName);
+    static GlobalBreakpoint findBreakpointFromContext(const ContextData &location);
 
     static void claimBreakpointsForEngine(DebuggerEngine *engine);
     static void toggleBreakpoint(const ContextData &location, const QString &tracePointMessage = QString());