4 files changed, 3 insertions, 32 deletions
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp
index 631c3f4dbc..d15a16eb43 100644
--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -31,6 +31,7 @@
 #include "glsleditorconstants.h"
 #include "glsleditorplugin.h"
 #include "glslhighlighter.h"
+#include "glslhoverhandler.h"
 #include "glslautocompleter.h"
 #include "glslcompletionassist.h"
 #include "glslindenter.h"
@@ -347,6 +348,7 @@ GlslEditorFactory::GlslEditorFactory()
                           | TextEditorActionHandler::UnCommentSelection
                           | TextEditorActionHandler::UnCollapseAll);
 
+    addHoverHandler(new GlslHoverHandler);
 }
 
 } // namespace Internal
diff --git a/src/plugins/glsleditor/glsleditorplugin.cpp b/src/plugins/glsleditor/glsleditorplugin.cpp
index 3034bbaad0..48485ef2ff 100644
--- a/src/plugins/glsleditor/glsleditorplugin.cpp
+++ b/src/plugins/glsleditor/glsleditorplugin.cpp
@@ -33,7 +33,6 @@
 #include "glsleditorconstants.h"
 #include "glslfilewizard.h"
 #include "glslhighlighter.h"
-#include "glslhoverhandler.h"
 
 #include <glsl/glslengine.h>
 #include <glsl/glslparser.h>
@@ -128,7 +127,6 @@ bool GlslEditorPlugin::initialize(const QStringList & /*arguments*/, QString *er
     if (!MimeDatabase::addMimeTypes(QLatin1String(":/glsleditor/GLSLEditor.mimetypes.xml"), errorMessage))
         return false;
 
-    addAutoReleasedObject(new GlslHoverHandler(this));
     addAutoReleasedObject(new GlslEditorFactory);
     addAutoReleasedObject(new GlslCompletionAssistProvider);
 
diff --git a/src/plugins/glsleditor/glslhoverhandler.cpp b/src/plugins/glsleditor/glslhoverhandler.cpp
index be76a9f2ca..d76289786c 100644
--- a/src/plugins/glsleditor/glslhoverhandler.cpp
+++ b/src/plugins/glsleditor/glslhoverhandler.cpp
@@ -29,30 +29,10 @@
 
 #include "glslhoverhandler.h"
 #include "glsleditor.h"
-#include "glsleditorconstants.h"
-
-#include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/helpmanager.h>
-#include <extensionsystem/pluginmanager.h>
-#include <texteditor/texteditor.h>
-
-using namespace Core;
 
 namespace GlslEditor {
 namespace Internal {
 
-GlslHoverHandler::GlslHoverHandler(QObject *parent) : BaseHoverHandler(parent)
-{}
-
-GlslHoverHandler::~GlslHoverHandler()
-{}
-
-bool GlslHoverHandler::acceptEditor(IEditor *editor)
-{
-    return editor->context().contains(Constants::C_GLSLEDITOR_ID);
-}
-
 void GlslHoverHandler::identifyMatch(TextEditor::TextEditorWidget *editorWidget, int pos)
 {
     if (!editorWidget->extraSelectionTooltip(pos).isEmpty())
diff --git a/src/plugins/glsleditor/glslhoverhandler.h b/src/plugins/glsleditor/glslhoverhandler.h
index 9df874b63a..6aeb1fe50f 100644
--- a/src/plugins/glsleditor/glslhoverhandler.h
+++ b/src/plugins/glsleditor/glslhoverhandler.h
@@ -32,24 +32,15 @@
 
 #include <texteditor/basehoverhandler.h>
 
-#include <QObject>
-
-namespace Core { class IEditor; }
-
-namespace TextEditor { class BaseTextEditor; }
-
 namespace GlslEditor {
 namespace Internal {
 
 class GlslHoverHandler : public TextEditor::BaseHoverHandler
 {
-    Q_OBJECT
 public:
-    GlslHoverHandler(QObject *parent = 0);
-    virtual ~GlslHoverHandler();
+    GlslHoverHandler() {}
 
 private:
-    virtual bool acceptEditor(Core::IEditor *editor);
     virtual void identifyMatch(TextEditor::TextEditorWidget *editorWidget, int pos);
     virtual void decorateToolTip();
 };