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

Debugger: Remove widget argument from tooltip request

Browse Source 
The only information ever used is whether it's c++ or not.

Change-Id: I4ca00663856dd66cbdf58c468f175a8c9e41d6a5
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
hjk
2015-03-06 13:36:42 +01:00
parent 34c807a11a
commit 46fcfa9018
18 changed files with 35 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/debugger/qml/qmlcppengine.cpp
View File

@@ -32,6 +32,7 @@
#include "qmlengine.h"
#include <debugger/debuggerruncontrol.h>
#include <debugger/debuggertooltipmanager.h>
#include <debugger/debuggerstartparameters.h>
#include <debugger/breakhandler.h>
#include <debugger/stackhandler.h>
@@ -39,8 +40,6 @@
#include <debugger/watchhandler.h>
#include <utils/qtcassert.h>
#include <texteditor/texteditor.h>
#include <texteditor/textdocument.h>
#include <qmljseditor/qmljseditorconstants.h>
#include <cppeditor/cppeditorconstants.h>
#include <qmljs/consolemanagerinterface.h>
@@ -103,15 +102,13 @@ bool QmlCppEngine::canDisplayTooltip() const
return m_cppEngine->canDisplayTooltip() || m_qmlEngine->canDisplayTooltip();
}
bool QmlCppEngine::setToolTipExpression(TextEditor::TextEditorWidget *editorWidget, const DebuggerToolTipContext &ctx)
bool QmlCppEngine::setToolTipExpression(const DebuggerToolTipContext &ctx)
{
QTC_ASSERT(editorWidget, return false);
bool success = false;
Core::Id id = editorWidget->textDocument()->id();
if (id == CppEditor::Constants::CPPEDITOR_ID)
success = m_cppEngine->setToolTipExpression(editorWidget, ctx);
else if (id == QmlJSEditor::Constants::C_QMLJSEDITOR_ID)
success = m_qmlEngine->setToolTipExpression(editorWidget, ctx);
if (ctx.isCppEditor)
success = m_cppEngine->setToolTipExpression(ctx);
else
success = m_qmlEngine->setToolTipExpression(ctx);
return success;
}