From ba876ffd480511d85731d3dc49b0718ba65dc633 Mon Sep 17 00:00:00 2001
From: Leandro Melo <leandro.melo@nokia.com>
Date: Wed, 1 Sep 2010 12:08:38 +0200
Subject: Improve editor's tooltip. Wrapping hack should no longer be
 necessary.

Also some less significant improvements.
---
 src/plugins/cppeditor/cpphoverhandler.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/plugins/cppeditor/cpphoverhandler.cpp')

diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp
index cebf33c43e..7f7346a83b 100644
--- a/src/plugins/cppeditor/cpphoverhandler.cpp
+++ b/src/plugins/cppeditor/cpphoverhandler.cpp
@@ -106,11 +106,10 @@ void CppHoverHandler::identifyMatch(TextEditor::ITextEditor *editor, int pos)
     }
 }
 
-void CppHoverHandler::decorateToolTip(TextEditor::ITextEditor *editor)
+void CppHoverHandler::decorateToolTip()
 {
-    CPPEditor *cppEditor = qobject_cast<CPPEditor *>(editor->widget());
-    if (!cppEditor)
-        return;
+    if (Qt::mightBeRichText(toolTip()))
+        setToolTip(Qt::escape(toolTip()));
 
     const TextEditor::HelpItem &help = lastHelpItemIdentified();
     if (help.isValid()) {
@@ -120,11 +119,6 @@ void CppHoverHandler::decorateToolTip(TextEditor::ITextEditor *editor)
                 appendToolTip(contents);
             else
                 setToolTip(contents);
-        } else {
-            QString tip = Qt::escape(toolTip());
-            tip.prepend(QLatin1String("<nobr>"));
-            tip.append(QLatin1String("</nobr>"));
-            setToolTip(tip);
         }
         addF1ToToolTip();
     }
-- 
cgit v1.2.1