From 4327ddf6c5e6c5b3d79722a9f1672769c5ee3a61 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 24 Sep 2020 10:29:51 +0200
Subject: [PATCH] Debugger: Use new TextMark interface for Breakpoint

Simplifies usage.

Change-Id: I0df50fe703b2b67ead7f2e35b3a3952fa6d91dab
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/debugger/breakhandler.cpp | 35 +++++----------------------
 src/plugins/debugger/breakhandler.h   |  1 -
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index fcd3aba6189..9a223a8cba7 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -94,8 +94,8 @@ public:
         setColor(Theme::Debugger_Breakpoint_TextMarkColor);
         setDefaultToolTip(QApplication::translate("BreakHandler", "Breakpoint"));
         setPriority(TextEditor::TextMark::NormalPriority);
-        setIcon(bp->icon());
-        setToolTip(bp->toolTip());
+        setIconProvider([bp] { return bp->icon(); });
+        setToolTipProvider([bp] { return bp->toolTip(); });
     }
 
     void updateLineNumber(int lineNumber) final
@@ -151,7 +151,8 @@ public:
     {
         setDefaultToolTip(QApplication::translate("BreakHandler", "Breakpoint"));
         setPriority(TextEditor::TextMark::NormalPriority);
-        setIcon(m_gbp->icon());
+        setIconProvider([this] { return m_gbp->icon(); });
+        setToolTipProvider([this] { return m_gbp->toolTip(); });
     }
 
     void removedFromEditor() final
@@ -1193,7 +1194,6 @@ void BreakHandler::requestBreakpointRemoval(const Breakpoint &bp)
 void BreakHandler::requestBreakpointEnabling(const Breakpoint &bp, bool enabled)
 {
     if (bp->m_parameters.enabled != enabled) {
-        bp->updateMarkerIcon();
         bp->update();
         requestBreakpointUpdate(bp);
     }
@@ -1858,15 +1858,6 @@ bool BreakpointItem::needsChange() const
     return false;
 }
 
-void BreakpointItem::updateMarkerIcon()
-{
-    if (m_marker) {
-        m_marker->setIcon(icon());
-        m_marker->setToolTip(toolTip());
-        m_marker->updateMarker();
-    }
-}
-
 void BreakpointItem::updateMarker()
 {
     const FilePath &file = markerFileName();
@@ -1876,9 +1867,6 @@ void BreakpointItem::updateMarker()
 
     if (!m_marker && !file.isEmpty() && line > 0)
         m_marker = new BreakpointMarker(this, file, line);
-
-    if (m_marker)
-        m_marker->setToolTip(toolTip());
 }
 
 QIcon BreakpointItem::icon() const
@@ -2285,15 +2273,6 @@ int GlobalBreakpointItem::markerLineNumber() const
     return m_params.lineNumber;
 }
 
-void GlobalBreakpointItem::updateMarkerIcon()
-{
-    if (m_marker) {
-        m_marker->setIcon(icon());
-        m_marker->setToolTip(toolTip());
-        m_marker->updateMarker();
-    }
-}
-
 void GlobalBreakpointItem::updateMarker()
 {
     if (usingEngine() != nullptr) {
@@ -2312,16 +2291,14 @@ void GlobalBreakpointItem::updateMarker()
     } else if (!m_params.fileName.isEmpty() && line > 0) {
         m_marker = new GlobalBreakpointMarker(this, m_params.fileName, line);
     }
-
-    if (m_marker)
-        m_marker->setToolTip(toolTip());
 }
 
 void GlobalBreakpointItem::setEnabled(bool enabled, bool descend)
 {
     if (m_params.enabled != enabled) {
         m_params.enabled = enabled;
-        updateMarkerIcon();
+        if (m_marker)
+            m_marker->updateMarker();
         update();
     }
 
diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h
index f0ee77b8727..bd24d6263db 100644
--- a/src/plugins/debugger/breakhandler.h
+++ b/src/plugins/debugger/breakhandler.h
@@ -199,7 +199,6 @@ public:
 private:
     void destroyMarker();
     void updateMarker();
-    void updateMarkerIcon();
     void setState(BreakpointState state);
 
     const GlobalBreakpoint m_globalBreakpoint; // Origin, or null for aliens.