From 3afbd1e5ccc4cb674f687092687f2533be57c34c Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Wed, 28 Jun 2017 14:26:52 +0200
Subject: [PATCH] De-qobjectify BaseHoverHandler and derivatives

Change-Id: I9bc1d849349f85b5c7fd6013396b8b15b6cb1568
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/cppeditor/resourcepreviewhoverhandler.h   |  2 --
 src/plugins/qmakeprojectmanager/profilehoverhandler.h |  2 --
 src/plugins/qmljseditor/qmljshoverhandler.h           |  3 ++-
 src/plugins/texteditor/basehoverhandler.h             | 10 +++++-----
 src/plugins/texteditor/colorpreviewhoverhandler.h     |  3 ---
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/plugins/cppeditor/resourcepreviewhoverhandler.h b/src/plugins/cppeditor/resourcepreviewhoverhandler.h
index 7f10db83d87..2ccb261c2a8 100644
--- a/src/plugins/cppeditor/resourcepreviewhoverhandler.h
+++ b/src/plugins/cppeditor/resourcepreviewhoverhandler.h
@@ -34,8 +34,6 @@ namespace Internal {
 
 class ResourcePreviewHoverHandler : public TextEditor::BaseHoverHandler
 {
-public:
-
 private:
     void identifyMatch(TextEditor::TextEditorWidget *editorWidget, int pos) override;
     void operateTooltip(TextEditor::TextEditorWidget *editorWidget, const QPoint &point) override;
diff --git a/src/plugins/qmakeprojectmanager/profilehoverhandler.h b/src/plugins/qmakeprojectmanager/profilehoverhandler.h
index 7f067b345b1..6e5b6ac03b1 100644
--- a/src/plugins/qmakeprojectmanager/profilehoverhandler.h
+++ b/src/plugins/qmakeprojectmanager/profilehoverhandler.h
@@ -37,8 +37,6 @@ namespace Internal {
 
 class ProFileHoverHandler : public TextEditor::BaseHoverHandler
 {
-    Q_OBJECT
-
 public:
     explicit ProFileHoverHandler(const TextEditor::Keywords &keywords);
 
diff --git a/src/plugins/qmljseditor/qmljshoverhandler.h b/src/plugins/qmljseditor/qmljshoverhandler.h
index e9f2d80ec80..fde05c7e4a6 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.h
+++ b/src/plugins/qmljseditor/qmljshoverhandler.h
@@ -29,6 +29,7 @@
 #include <texteditor/basehoverhandler.h>
 
 #include <QColor>
+#include <QCoreApplication>
 
 QT_BEGIN_NAMESPACE
 template <class> class QList;
@@ -49,7 +50,7 @@ class QmlJSEditorWidget;
 
 class QmlJSHoverHandler : public TextEditor::BaseHoverHandler
 {
-    Q_OBJECT
+    Q_DECLARE_TR_FUNCTIONS(QmlJSHoverHandler)
 
 public:
     QmlJSHoverHandler();
diff --git a/src/plugins/texteditor/basehoverhandler.h b/src/plugins/texteditor/basehoverhandler.h
index 7a5334e3a8e..cf9c8d7f90e 100644
--- a/src/plugins/texteditor/basehoverhandler.h
+++ b/src/plugins/texteditor/basehoverhandler.h
@@ -28,7 +28,9 @@
 #include "texteditor_global.h"
 #include "helpitem.h"
 
-#include <QObject>
+QT_BEGIN_NAMESPACE
+class QPoint;
+QT_END_NAMESPACE
 
 namespace Core { class IEditor; }
 
@@ -37,13 +39,11 @@ namespace TextEditor {
 class BaseTextEditor;
 class TextEditorWidget;
 
-class TEXTEDITOR_EXPORT BaseHoverHandler : public QObject
+class TEXTEDITOR_EXPORT BaseHoverHandler
 {
-    Q_OBJECT
-
 public:
     BaseHoverHandler();
-    ~BaseHoverHandler();
+    virtual ~BaseHoverHandler();
 
     QString contextHelpId(TextEditorWidget *widget, int pos);
     int checkToolTip(TextEditorWidget *widget, int pos);
diff --git a/src/plugins/texteditor/colorpreviewhoverhandler.h b/src/plugins/texteditor/colorpreviewhoverhandler.h
index 2e956027dcc..8677bf009a2 100644
--- a/src/plugins/texteditor/colorpreviewhoverhandler.h
+++ b/src/plugins/texteditor/colorpreviewhoverhandler.h
@@ -38,9 +38,6 @@ class TextEditorWidget;
 
 class TEXTEDITOR_EXPORT ColorPreviewHoverHandler : public BaseHoverHandler
 {
-    Q_OBJECT
-public:
-
 private:
     void identifyMatch(TextEditorWidget *editorWidget, int pos) override;
     void operateTooltip(TextEditorWidget *editorWidget, const QPoint &point) override;