feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Adapt to latest settings access style

Browse Source 
Change-Id: I14f737612b4fe6a37e650190b587ef0b04e559ea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-07-13 15:23:29 +02:00
parent 9b2075e7ea
commit a5e773aeee
25 changed files with 202 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/debugger/breakhandler.cpp
View File

@@ -1101,10 +1101,10 @@ QVariant BreakpointItem::data(int column, int role) const
break;
}
if (role == Qt::ToolTipRole && debuggerSettings()->useToolTipsInBreakpointsView.value())
if (role == Qt::ToolTipRole && settings().useToolTipsInBreakpointsView())
return toolTip();
return QVariant();
return {};
}
void BreakpointItem::addToCommand(DebuggerCommand *cmd, BreakpointPathUsage defaultPathUsage) const
@@ -1689,8 +1689,8 @@ bool BreakHandler::contextMenuEvent(const ItemViewEvent &ev)
menu->addSeparator();
menu->addAction(debuggerSettings()->useToolTipsInBreakpointsView.action());
menu->addAction(debuggerSettings()->settingsDialog.action());
menu->addAction(settings().useToolTipsInBreakpointsView.action());
menu->addAction(settings().settingsDialog.action());
connect(menu, &QMenu::aboutToHide, menu, &QObject::deleteLater);
menu->popup(ev.globalPos());
@@ -2219,10 +2219,10 @@ QVariant GlobalBreakpointItem::data(int column, int role) const
break;
}
if (role == Qt::ToolTipRole && debuggerSettings()->useToolTipsInBreakpointsView.value())
if (role == Qt::ToolTipRole && settings().useToolTipsInBreakpointsView())
return toolTip();
return QVariant();
return {};
}
QIcon GlobalBreakpointItem::icon() const
@@ -2495,7 +2495,7 @@ void BreakpointManager::setOrRemoveBreakpoint(const ContextData &location, const
BreakpointParameters data;
if (location.type == LocationByFile) {
data.type = BreakpointByFileAndLine;
if (debuggerSettings()->breakpointsFullPathByDefault.value())
if (settings().breakpointsFullPathByDefault())
data.pathUsage = BreakpointUseFullPath;
data.tracepoint = !tracePointMessage.isEmpty();
data.message = tracePointMessage;
@@ -2686,8 +2686,8 @@ bool BreakpointManager::contextMenuEvent(const ItemViewEvent &ev)
menu->addSeparator();
menu->addAction(debuggerSettings()->useToolTipsInBreakpointsView.action());
menu->addAction(debuggerSettings()->settingsDialog.action());
menu->addAction(settings().useToolTipsInBreakpointsView.action());
menu->addAction(settings().settingsDialog.action());
connect(menu, &QMenu::aboutToHide, menu, &QObject::deleteLater);
menu->popup(ev.globalPos());