feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

De-qobjectify BaseHoverHandler and derivatives

Browse Source 
Change-Id: I9bc1d849349f85b5c7fd6013396b8b15b6cb1568
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-06-28 14:26:52 +02:00
parent 7bc88000d9
commit 3afbd1e5cc
5 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cppeditor/resourcepreviewhoverhandler.h
View File

@@ -34,8 +34,6 @@ namespace Internal {
class ResourcePreviewHoverHandler : public TextEditor::BaseHoverHandler class ResourcePreviewHoverHandler : public TextEditor::BaseHoverHandler
{ {
public:
private: private:
void identifyMatch(TextEditor::TextEditorWidget *editorWidget, int pos) override; void identifyMatch(TextEditor::TextEditorWidget *editorWidget, int pos) override;
void operateTooltip(TextEditor::TextEditorWidget *editorWidget, const QPoint &point) override; void operateTooltip(TextEditor::TextEditorWidget *editorWidget, const QPoint &point) override;

2
src/plugins/qmakeprojectmanager/profilehoverhandler.h
View File

@@ -37,8 +37,6 @@ namespace Internal {
class ProFileHoverHandler : public TextEditor::BaseHoverHandler class ProFileHoverHandler : public TextEditor::BaseHoverHandler
{ {
Q_OBJECT
public: public:
explicit ProFileHoverHandler(const TextEditor::Keywords &keywords); explicit ProFileHoverHandler(const TextEditor::Keywords &keywords);

3
src/plugins/qmljseditor/qmljshoverhandler.h
View File

@@ -29,6 +29,7 @@
#include <texteditor/basehoverhandler.h> #include <texteditor/basehoverhandler.h>
#include <QColor> #include <QColor>
#include <QCoreApplication>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
template <class> class QList; template <class> class QList;
@@ -49,7 +50,7 @@ class QmlJSEditorWidget;
class QmlJSHoverHandler : public TextEditor::BaseHoverHandler class QmlJSHoverHandler : public TextEditor::BaseHoverHandler
{ {
Q_OBJECT Q_DECLARE_TR_FUNCTIONS(QmlJSHoverHandler)
public: public:
QmlJSHoverHandler(); QmlJSHoverHandler();

10
src/plugins/texteditor/basehoverhandler.h
View File

@@ -28,7 +28,9 @@
#include "texteditor_global.h" #include "texteditor_global.h"
#include "helpitem.h" #include "helpitem.h"
#include <QObject> QT_BEGIN_NAMESPACE
class QPoint;
QT_END_NAMESPACE
namespace Core { class IEditor; } namespace Core { class IEditor; }
@@ -37,13 +39,11 @@ namespace TextEditor {
class BaseTextEditor; class BaseTextEditor;
class TextEditorWidget; class TextEditorWidget;
class TEXTEDITOR_EXPORT BaseHoverHandler : public QObject class TEXTEDITOR_EXPORT BaseHoverHandler
{ {
Q_OBJECT
public: public:
BaseHoverHandler(); BaseHoverHandler();
~BaseHoverHandler(); virtual ~BaseHoverHandler();
QString contextHelpId(TextEditorWidget *widget, int pos); QString contextHelpId(TextEditorWidget *widget, int pos);
int checkToolTip(TextEditorWidget *widget, int pos); int checkToolTip(TextEditorWidget *widget, int pos);

3
src/plugins/texteditor/colorpreviewhoverhandler.h
View File

@@ -38,9 +38,6 @@ class TextEditorWidget;
class TEXTEDITOR_EXPORT ColorPreviewHoverHandler : public BaseHoverHandler class TEXTEDITOR_EXPORT ColorPreviewHoverHandler : public BaseHoverHandler
{ {
Q_OBJECT
public:
private: private:
void identifyMatch(TextEditorWidget *editorWidget, int pos) override; void identifyMatch(TextEditorWidget *editorWidget, int pos) override;
void operateTooltip(TextEditorWidget *editorWidget, const QPoint &point) override; void operateTooltip(TextEditorWidget *editorWidget, const QPoint &point) override;