diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-06-28 14:43:13 +0200 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-06-29 08:01:28 +0000 |
commit | a7e8406ced48818682e52ca208af94c18c8c837e (patch) | |
tree | 921bebf8cfedaea982ddd4e1c6bc960de0f358f1 /src/plugins/cppeditor/cpphoverhandler.cpp | |
parent | 658e468d80b1741cd96f92f64f51c4f2a171d253 (diff) |
TextEditor: Remove unneeded functions in BaseHoverHandler
Change-Id: Ic61babb48cca0711812256b766f1db62895901f6
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/cppeditor/cpphoverhandler.cpp')
-rw-r--r-- | src/plugins/cppeditor/cpphoverhandler.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp index 3f0ee1fdc4..75b5913f17 100644 --- a/src/plugins/cppeditor/cpphoverhandler.cpp +++ b/src/plugins/cppeditor/cpphoverhandler.cpp @@ -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(); |