From a2a29d1861b7f11df7a60c9b022fe4ed8220345c Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 16 Oct 2018 13:47:52 +0200 Subject: Debugger: Re-enable breakpoint state handling with keyboard This patch re-enables disabling or enabling breakpoints using the respective keyboard shortcut. Had been disabled since d6911fd10c0d. Change-Id: Iea3ce679bafcc78910be07984fd03b4a6e66eb8b Reviewed-by: hjk --- src/plugins/debugger/breakhandler.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/plugins/debugger/breakhandler.cpp') diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index 4a43a7935a..be5c2f2b7c 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -2565,17 +2565,17 @@ bool BreakpointManager::setData(const QModelIndex &idx, const QVariant &value, i // setCurrentIndex(index(row, 0)); FIXME return true; } -// if (kev->key() == Qt::Key_Space) { -// const QModelIndexList selectedIds = ev.selectedRows(); -// if (!selectedIds.isEmpty()) { -// const GlobalBreakpoints gbps = findBreakpointsByIndex(selectedIds); -// const bool isEnabled = gbps.isEmpty() || gbps.at(0)->isEnabled(); -// for (GlobalBreakpoint gbp : gbps) -// gbp->m_parameters.enabled = isEnabled; + if (kev->key() == Qt::Key_Space) { + const QModelIndexList selectedIds = ev.selectedRows(); + if (!selectedIds.isEmpty()) { + const GlobalBreakpoints gbps = findBreakpointsByIndex(selectedIds); + const bool isEnabled = gbps.isEmpty() || gbps.at(0)->isEnabled(); + for (GlobalBreakpoint gbp : gbps) + gbp->setEnabled(!isEnabled); // scheduleSynchronization(); -// return true; -// } -// } + return true; + } + } } if (ev.as(QEvent::MouseButtonDblClick)) { -- cgit v1.2.1 From eebfc5f5deab83f99c6dd147d19214c5eb8aeaae Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 19 Oct 2018 14:45:20 +0200 Subject: Debugger: Remove wrong state transition Change-Id: Ie199370e6dc9e8c3efe293be76cb89feacb8d4c5 Reviewed-by: hjk --- src/plugins/debugger/breakhandler.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/plugins/debugger/breakhandler.cpp') diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index be5c2f2b7c..f56cfb9121 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -1709,7 +1709,6 @@ void BreakHandler::removeBreakpoint(const Breakpoint &bp) break; case BreakpointInserted: case BreakpointInsertionProceeding: - bp->setState(BreakpointRemoveRequested); requestBreakpointRemoval(bp); break; case BreakpointNew: -- cgit v1.2.1