diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-06-28 14:33:54 +0200 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-06-29 08:01:21 +0000 |
commit | 658e468d80b1741cd96f92f64f51c4f2a171d253 (patch) | |
tree | 7b6b1843dcd96f4ca73a6d9c772ed078ccbc5429 /src | |
parent | 3afbd1e5ccc4cb674f687092687f2533be57c34c (diff) | |
download | qt-creator-658e468d80b1741cd96f92f64f51c4f2a171d253.tar.gz |
TextEditor: Clean up BaseHoverHandler
Change-Id: Ie2f0c8c0a46377ae18ff4e31c7e43b1242cb7372
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/texteditor/basehoverhandler.cpp | 9 | ||||
-rw-r--r-- | src/plugins/texteditor/basehoverhandler.h | 28 |
2 files changed, 12 insertions, 25 deletions
diff --git a/src/plugins/texteditor/basehoverhandler.cpp b/src/plugins/texteditor/basehoverhandler.cpp index 5e2ffac50f..b5c1a46fb6 100644 --- a/src/plugins/texteditor/basehoverhandler.cpp +++ b/src/plugins/texteditor/basehoverhandler.cpp @@ -26,19 +26,10 @@ #include "basehoverhandler.h" #include "texteditor.h" -#include <coreplugin/icore.h> #include <utils/tooltip/tooltip.h> -#include <QPoint> - -using namespace Core; - namespace TextEditor { -BaseHoverHandler::BaseHoverHandler() : m_diagnosticTooltip(false), m_priority(-1) -{ -} - BaseHoverHandler::~BaseHoverHandler() {} diff --git a/src/plugins/texteditor/basehoverhandler.h b/src/plugins/texteditor/basehoverhandler.h index cf9c8d7f90..fe686ddcd4 100644 --- a/src/plugins/texteditor/basehoverhandler.h +++ b/src/plugins/texteditor/basehoverhandler.h @@ -32,26 +32,30 @@ QT_BEGIN_NAMESPACE class QPoint; QT_END_NAMESPACE -namespace Core { class IEditor; } - namespace TextEditor { -class BaseTextEditor; class TextEditorWidget; class TEXTEDITOR_EXPORT BaseHoverHandler { public: - BaseHoverHandler(); virtual ~BaseHoverHandler(); QString contextHelpId(TextEditorWidget *widget, int pos); + int checkToolTip(TextEditorWidget *widget, int pos); void showToolTip(TextEditorWidget *widget, const QPoint &point, int pos); +protected: + enum { + Priority_None = 0, + Priority_Tooltip = 5, + Priority_Help = 10, + Priority_Diagnostic = 20 + }; + void setPriority(int priority); int priority() const; -protected: void setToolTip(const QString &tooltip); void appendToolTip(const QString &extension); const QString &toolTip() const; @@ -62,26 +66,18 @@ protected: void setLastHelpItemIdentified(const HelpItem &help); const HelpItem &lastHelpItemIdentified() const; + virtual void identifyMatch(TextEditorWidget *editorWidget, int pos); virtual void decorateToolTip(); virtual void operateTooltip(TextEditorWidget *editorWidget, const QPoint &point); - enum { - Priority_None = 0, - Priority_Tooltip = 5, - Priority_Help = 10, - Priority_Diagnostic = 20 - }; - void setPriority(int priority); private: void clear(); void process(TextEditorWidget *widget, int pos); - virtual void identifyMatch(TextEditorWidget *editorWidget, int pos); - - bool m_diagnosticTooltip; + bool m_diagnosticTooltip = false; QString m_toolTip; HelpItem m_lastHelpItemIdentified; - int m_priority; + int m_priority = -1; }; } // namespace TextEditor |