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

Debugger: Split ToolTipManager into per-engine parts

Browse Source 
Change-Id: If2e601a91ad2a0e5ba30916a5d1f2312ecff944f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2018-08-23 15:21:43 +02:00
parent e1e1790402
commit 893146b8b6
8 changed files with 172 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/watchhandler.cpp
View File

@@ -1683,8 +1683,8 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev)
});
addAction(menu, tr("Close Editor Tooltips"),
DebuggerToolTipManager::hasToolTips(),
[] { DebuggerToolTipManager::closeAllToolTips(); });
m_engine->toolTipManager()->hasToolTips(),
[this] { m_engine->toolTipManager()->closeAllToolTips(); });
addAction(menu, tr("Copy View Contents to Clipboard"),
true,
@@ -2578,8 +2578,8 @@ static inline QJsonObject watcher(const QString &iname, const QString &exp)
void WatchHandler::appendWatchersAndTooltipRequests(DebuggerCommand *cmd)
{
QJsonArray watchers;
DebuggerToolTipContexts toolTips = DebuggerToolTipManager::pendingTooltips(m_model->m_engine);
foreach (const DebuggerToolTipContext &p, toolTips)
const DebuggerToolTipContexts toolTips = m_engine->toolTipManager()->pendingTooltips();
for (const DebuggerToolTipContext &p : toolTips)
watchers.append(watcher(p.iname, p.expression));
QMapIterator<QString, int> it(WatchHandler::watcherNames());