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

TextEditor: Remove unneeded functions in BaseHoverHandler

Browse Source 
Change-Id: Ic61babb48cca0711812256b766f1db62895901f6
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-06-28 14:43:13 +02:00
parent 658e468d80
commit a7e8406ced
3 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cppeditor/cpphoverhandler.cpp
View File

@@ -97,7 +97,7 @@ void CppHoverHandler::identifyMatch(TextEditorWidget *editorWidget, int pos)
m_positionForEditorDocumentProcessor = -1;
if (editorDocumentProcessorHasDiagnosticAt(editorWidget, pos)) {
setIsDiagnosticTooltip(true);
setPriority(Priority_Diagnostic);
m_positionForEditorDocumentProcessor = pos;
} else if (!editorWidget->extraSelectionTooltip(pos).isEmpty()) {
setToolTip(editorWidget->extraSelectionTooltip(pos));
@@ -110,12 +110,14 @@ void CppHoverHandler::identifyMatch(TextEditorWidget *editorWidget, int pos)
evaluator.execute();
if (evaluator.hasDiagnosis()) {
setToolTip(evaluator.diagnosis());
setIsDiagnosticTooltip(true);
setPriority(Priority_Diagnostic);
}
if (evaluator.identifiedCppElement()) {
const QSharedPointer<CppElement> &cppElement = evaluator.cppElement();
if (!isDiagnosticTooltip())
if (priority() != Priority_Diagnostic) {
setToolTip(cppElement->tooltip);
setPriority(cppElement->tooltip.isEmpty() ? Priority_None : Priority_Tooltip);
}
QStringList candidates = cppElement->helpIdCandidates;
candidates.removeDuplicates();
foreach (const QString &helpId, candidates) {
@@ -143,7 +145,7 @@ void CppHoverHandler::decorateToolTip()
if (Qt::mightBeRichText(toolTip()))
setToolTip(toolTip().toHtmlEscaped());
if (isDiagnosticTooltip())
if (priority() != Priority_Diagnostic)
return;
const HelpItem &help = lastHelpItemIdentified();