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

Move TextEditor::ToolTip to Utils

Browse Source 
To enabled reuse from all plugins.

Change-Id: I1de68c8e6ed017d45f1248b2043f9611becc3b54
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Daniel Teske
2013-01-10 15:07:17 +01:00
parent d26ec5048f
commit 8e75e611a5
23 changed files with 94 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -64,7 +64,6 @@
#include <texteditor/texteditorsettings.h>
#include <texteditor/syntaxhighlighter.h>
#include <texteditor/refactoroverlay.h>
#include <texteditor/tooltip/tooltip.h>
#include <texteditor/codeassist/genericproposal.h>
#include <texteditor/codeassist/basicproposalitemlistmodel.h>
#include <qmldesigner/qmldesignerconstants.h>

14
src/plugins/qmljseditor/qmljshoverhandler.cpp
View File

@@ -46,8 +46,8 @@
#include <texteditor/itexteditor.h>
#include <texteditor/basetexteditor.h>
#include <texteditor/helpitem.h>
#include <texteditor/tooltip/tooltip.h>
#include <texteditor/tooltip/tipcontents.h>
#include <utils/tooltip/tooltip.h>
#include <utils/tooltip/tipcontents.h>
#include <QDir>
#include <QList>
@@ -265,15 +265,15 @@ void HoverHandler::reset()
void HoverHandler::operateTooltip(TextEditor::ITextEditor *editor, const QPoint &point)
{
if (toolTip().isEmpty())
TextEditor::ToolTip::instance()->hide();
Utils::ToolTip::instance()->hide();
else {
if (m_colorTip.isValid()) {
TextEditor::ToolTip::instance()->show(point,
TextEditor::ColorContent(m_colorTip),
Utils::ToolTip::instance()->show(point,
Utils::ColorContent(m_colorTip),
editor->widget());
} else {
TextEditor::ToolTip::instance()->show(point,
TextEditor::TextContent(toolTip()),
Utils::ToolTip::instance()->show(point,
Utils::TextContent(toolTip()),
editor->widget());
}
}