aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/glsleditor
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2017-06-28 13:50:18 +0200
committerNikolai Kosjar <nikolai.kosjar@qt.io>2017-06-28 13:43:33 +0000
commit70283a9ea60c6bb02015800c614b5d5b4461d02e (patch)
tree75bbb8c0501f83f22ad046c8020af48bfc9d3563 /src/plugins/glsleditor
parentd870bab95c04786dc0ee5d8d44d5fad484b89a48 (diff)
GLSLEditor: Remove GlslHoverHandler
The BaseHoverHandler does the same job. Change-Id: I2708a87ed5cbc3b320766f52927be4a9670b522b Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/glsleditor')
-rw-r--r--src/plugins/glsleditor/glsleditor.cpp3
-rw-r--r--src/plugins/glsleditor/glsleditor.pro2
-rw-r--r--src/plugins/glsleditor/glsleditor.qbs2
-rw-r--r--src/plugins/glsleditor/glslhoverhandler.cpp45
-rw-r--r--src/plugins/glsleditor/glslhoverhandler.h44
5 files changed, 0 insertions, 96 deletions
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp
index 5160828b4b..feb283f02a 100644
--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -27,7 +27,6 @@
#include "glsleditorconstants.h"
#include "glsleditorplugin.h"
#include "glslhighlighter.h"
-#include "glslhoverhandler.h"
#include "glslautocompleter.h"
#include "glslcompletionassist.h"
#include "glslindenter.h"
@@ -332,8 +331,6 @@ GlslEditorFactory::GlslEditorFactory()
setEditorActionHandlers(TextEditorActionHandler::Format
| TextEditorActionHandler::UnCommentSelection
| TextEditorActionHandler::UnCollapseAll);
-
- addHoverHandler(new GlslHoverHandler);
}
} // namespace Internal
diff --git a/src/plugins/glsleditor/glsleditor.pro b/src/plugins/glsleditor/glsleditor.pro
index 8f588ecb56..5abc106970 100644
--- a/src/plugins/glsleditor/glsleditor.pro
+++ b/src/plugins/glsleditor/glsleditor.pro
@@ -10,7 +10,6 @@ glsleditorplugin.h \
glslhighlighter.h \
glslautocompleter.h \
glslindenter.h \
-glslhoverhandler.h \
glslcompletionassist.h
SOURCES += \
@@ -19,7 +18,6 @@ glsleditorplugin.cpp \
glslhighlighter.cpp \
glslautocompleter.cpp \
glslindenter.cpp \
-glslhoverhandler.cpp \
glslcompletionassist.cpp
RESOURCES += glsleditor.qrc
diff --git a/src/plugins/glsleditor/glsleditor.qbs b/src/plugins/glsleditor/glsleditor.qbs
index 1d5003de46..23f7b4f429 100644
--- a/src/plugins/glsleditor/glsleditor.qbs
+++ b/src/plugins/glsleditor/glsleditor.qbs
@@ -25,8 +25,6 @@ QtcPlugin {
"glsleditorplugin.h",
"glslhighlighter.cpp",
"glslhighlighter.h",
- "glslhoverhandler.cpp",
- "glslhoverhandler.h",
"glslindenter.cpp",
"glslindenter.h",
]
diff --git a/src/plugins/glsleditor/glslhoverhandler.cpp b/src/plugins/glsleditor/glslhoverhandler.cpp
deleted file mode 100644
index 305852f074..0000000000
--- a/src/plugins/glsleditor/glslhoverhandler.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#include "glslhoverhandler.h"
-#include "glsleditor.h"
-
-namespace GlslEditor {
-namespace Internal {
-
-void GlslHoverHandler::identifyMatch(TextEditor::TextEditorWidget *editorWidget, int pos)
-{
- if (!editorWidget->extraSelectionTooltip(pos).isEmpty())
- setToolTip(editorWidget->extraSelectionTooltip(pos));
-}
-
-void GlslHoverHandler::decorateToolTip()
-{
- if (Qt::mightBeRichText(toolTip()))
- setToolTip(toolTip().toHtmlEscaped());
-}
-
-} // namespace Internal
-} // namespace GlslEditor
diff --git a/src/plugins/glsleditor/glslhoverhandler.h b/src/plugins/glsleditor/glslhoverhandler.h
deleted file mode 100644
index 5d1f29067e..0000000000
--- a/src/plugins/glsleditor/glslhoverhandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include <texteditor/basehoverhandler.h>
-
-namespace GlslEditor {
-namespace Internal {
-
-class GlslHoverHandler : public TextEditor::BaseHoverHandler
-{
-public:
- GlslHoverHandler() {}
-
-private:
- void identifyMatch(TextEditor::TextEditorWidget *editorWidget, int pos) override;
- void decorateToolTip() override;
-};
-
-} // namespace Internal
-} // namespace GlslEditor