TextEditor: Only use tooltipOverrideRequested in *Widget

One signal less, one connection less, less indirection in user code.

Change-Id: Ie49d4a76982f2ff9d2b307ed541c33c6a7ea6480
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-09-19 16:17:05 +02:00
parent 558864f254
commit e90a8a051c
4 changed files with 10 additions and 15 deletions

View File

@@ -1252,7 +1252,7 @@ void DebuggerToolTipManager::slotEditorOpened(IEditor *e)
BaseTextEditorWidget *widget = textEditor->editorWidget();
connect(widget->verticalScrollBar(), &QScrollBar::valueChanged,
this, &DebuggerToolTipManager::slotUpdateVisibleToolTips);
connect(textEditor, &BaseTextEditor::tooltipOverrideRequested,
connect(widget, &BaseTextEditorWidget::tooltipOverrideRequested,
this, &DebuggerToolTipManager::slotTooltipOverrideRequested);
}
}
@@ -1298,21 +1298,21 @@ void DebuggerToolTipManager::leavingDebugMode()
}
void DebuggerToolTipManager::slotTooltipOverrideRequested
(BaseTextEditor *editor, const QPoint &point, int pos, bool *handled)
(BaseTextEditorWidget *editorWidget, const QPoint &point, int pos, bool *handled)
{
QTC_ASSERT(handled, return);
QTC_ASSERT(editor, return);
QTC_ASSERT(editorWidget, return);
const int movedDistance = (point - d->m_lastToolTipPoint).manhattanLength();
if (d->m_lastToolTipEditor == editor->editorWidget() && movedDistance < 25) {
if (d->m_lastToolTipEditor == editorWidget && movedDistance < 25) {
*handled = true;
return;
}
*handled = tryHandleToolTipOverride(editor->editorWidget(), point, pos);
*handled = tryHandleToolTipOverride(editorWidget, point, pos);
if (*handled) {
d->m_lastToolTipEditor = editor->editorWidget();
d->m_lastToolTipEditor = editorWidget;
d->m_lastToolTipPoint = point;
} else {
d->m_lastToolTipEditor = 0;