diff --git a/src/plugins/texteditor/basehoverhandler.cpp b/src/plugins/texteditor/basehoverhandler.cpp
index 8acdc55811da094b4f444ba26594bef4a3a6b84b..cecb9c1457a37e3dbd8ef8adb39853cfdc03ed40 100644
--- a/src/plugins/texteditor/basehoverhandler.cpp
+++ b/src/plugins/texteditor/basehoverhandler.cpp
@@ -37,9 +37,17 @@
 
 #include <QPoint>
 
-using namespace TextEditor;
 using namespace Core;
 
+namespace TextEditor {
+
+static BaseTextEditorWidget *baseTextEditor(ITextEditor *editor)
+{
+    if (!editor)
+        return 0;
+    return qobject_cast<BaseTextEditorWidget *>(editor->widget());
+}
+
 BaseHoverHandler::BaseHoverHandler(QObject *parent) : QObject(parent), m_diagnosticTooltip(false)
 {
     // Listen for editor opened events in order to connect to tooltip/helpid requests
@@ -94,13 +102,19 @@ void BaseHoverHandler::updateContextHelpId(TextEditor::ITextEditor *editor, int
 }
 
 void BaseHoverHandler::setToolTip(const QString &tooltip)
-{ m_toolTip = tooltip; }
+{
+    m_toolTip = tooltip;
+}
 
 const QString &BaseHoverHandler::toolTip() const
-{ return m_toolTip; }
+{
+    return m_toolTip;
+}
 
 void BaseHoverHandler::appendToolTip(const QString &extension)
-{ m_toolTip.append(extension); }
+{
+    m_toolTip.append(extension);
+}
 
 void BaseHoverHandler::addF1ToToolTip()
 {
@@ -120,10 +134,14 @@ bool BaseHoverHandler::isDiagnosticTooltip() const
 }
 
 void BaseHoverHandler::setLastHelpItemIdentified(const HelpItem &help)
-{ m_lastHelpItemIdentified = help; }
+{
+    m_lastHelpItemIdentified = help;
+}
 
 const HelpItem &BaseHoverHandler::lastHelpItemIdentified() const
-{ return m_lastHelpItemIdentified; }
+{
+    return m_lastHelpItemIdentified;
+}
 
 void BaseHoverHandler::clear()
 {
@@ -162,9 +180,4 @@ void BaseHoverHandler::operateTooltip(ITextEditor *editor, const QPoint &point)
         Utils::ToolTip::show(point, Utils::TextContent(m_toolTip), editor->widget());
 }
 
-BaseTextEditorWidget *BaseHoverHandler::baseTextEditor(ITextEditor *editor)
-{
-    if (!editor)
-        return 0;
-    return qobject_cast<BaseTextEditorWidget *>(editor->widget());
-}
+} // namespace TextEditor
diff --git a/src/plugins/texteditor/basehoverhandler.h b/src/plugins/texteditor/basehoverhandler.h
index 59e999c8d9d0d1176fa2a735b6d5bf97542fa5c4..b0c77f4f2758073bc9dd944731eae0ca0271e29d 100644
--- a/src/plugins/texteditor/basehoverhandler.h
+++ b/src/plugins/texteditor/basehoverhandler.h
@@ -52,9 +52,10 @@ class BaseTextEditorWidget;
 class TEXTEDITOR_EXPORT BaseHoverHandler : public QObject
 {
     Q_OBJECT
+
 public:
     BaseHoverHandler(QObject *parent = 0);
-    virtual ~BaseHoverHandler();
+    ~BaseHoverHandler();
 
 private slots:
     void editorOpened(Core::IEditor *editor);
@@ -74,8 +75,6 @@ protected:
     void setLastHelpItemIdentified(const HelpItem &help);
     const HelpItem &lastHelpItemIdentified() const;
 
-    static BaseTextEditorWidget *baseTextEditor(ITextEditor *editor);
-
 private:
     void clear();
     void process(ITextEditor *editor, int pos);