From a7e8406ced48818682e52ca208af94c18c8c837e Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Wed, 28 Jun 2017 14:43:13 +0200
Subject: [PATCH] TextEditor: Remove unneeded functions in BaseHoverHandler
Change-Id: Ic61babb48cca0711812256b766f1db62895901f6
Reviewed-by: David Schulz <david.schulz@qt.io>
---
src/plugins/cppeditor/cpphoverhandler.cpp | 10 +++++----
src/plugins/texteditor/basehoverhandler.cpp | 25 +++------------------
src/plugins/texteditor/basehoverhandler.h | 5 -----
3 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp
index 3f0ee1fdc4d..75b5913f17b 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();
diff --git a/src/plugins/texteditor/basehoverhandler.cpp b/src/plugins/texteditor/basehoverhandler.cpp
index b5c1a46fb60..7764f12dbdd 100644
--- a/src/plugins/texteditor/basehoverhandler.cpp
+++ b/src/plugins/texteditor/basehoverhandler.cpp
@@ -55,9 +55,6 @@ int BaseHoverHandler::priority() const
if (m_priority >= 0)
return m_priority;
- if (isDiagnosticTooltip())
- return Priority_Diagnostic;
-
if (lastHelpItemIdentified().isValid())
return Priority_Help;
@@ -94,21 +91,6 @@ const QString &BaseHoverHandler::toolTip() const
return m_toolTip;
}
-void BaseHoverHandler::appendToolTip(const QString &extension)
-{
- m_toolTip.append(extension);
-}
-
-void BaseHoverHandler::setIsDiagnosticTooltip(bool isDiagnosticTooltip)
-{
- m_diagnosticTooltip = isDiagnosticTooltip;
-}
-
-bool BaseHoverHandler::isDiagnosticTooltip() const
-{
- return m_diagnosticTooltip;
-}
-
void BaseHoverHandler::setLastHelpItemIdentified(const HelpItem &help)
{
m_lastHelpItemIdentified = help;
@@ -121,7 +103,6 @@ const HelpItem &BaseHoverHandler::lastHelpItemIdentified() const
void BaseHoverHandler::clear()
{
- m_diagnosticTooltip = false;
m_toolTip.clear();
m_priority = -1;
m_lastHelpItemIdentified = HelpItem();
@@ -146,11 +127,11 @@ void BaseHoverHandler::decorateToolTip()
if (Qt::mightBeRichText(toolTip()))
setToolTip(toolTip().toHtmlEscaped());
- if (!isDiagnosticTooltip() && lastHelpItemIdentified().isValid()) {
+ if (priority() != Priority_Diagnostic && lastHelpItemIdentified().isValid()) {
const QString &contents = lastHelpItemIdentified().extractContent(false);
if (!contents.isEmpty()) {
- setToolTip(toolTip().toHtmlEscaped());
- appendToolTip(contents);
+ m_toolTip = toolTip().toHtmlEscaped();
+ m_toolTip.append(contents);
}
}
}
diff --git a/src/plugins/texteditor/basehoverhandler.h b/src/plugins/texteditor/basehoverhandler.h
index fe686ddcd4f..351d8df490a 100644
--- a/src/plugins/texteditor/basehoverhandler.h
+++ b/src/plugins/texteditor/basehoverhandler.h
@@ -57,12 +57,8 @@ protected:
int priority() const;
void setToolTip(const QString &tooltip);
- void appendToolTip(const QString &extension);
const QString &toolTip() const;
- void setIsDiagnosticTooltip(bool isDiagnosticTooltip);
- bool isDiagnosticTooltip() const;
-
void setLastHelpItemIdentified(const HelpItem &help);
const HelpItem &lastHelpItemIdentified() const;
@@ -74,7 +70,6 @@ private:
void clear();
void process(TextEditorWidget *widget, int pos);
- bool m_diagnosticTooltip = false;
QString m_toolTip;
HelpItem m_lastHelpItemIdentified;
int m_priority = -1;
--
GitLab