diff options
author | Daniel Teske <daniel.teske@digia.com> | 2013-01-10 15:07:17 +0100 |
---|---|---|
committer | Daniel Teske <daniel.teske@digia.com> | 2013-01-11 15:06:00 +0100 |
commit | 8e75e611a5f1e0aa4489cdf328cf91a916be08ef (patch) | |
tree | 22914d3b4fc67c45544e35d760166687ce3ee26f | |
parent | d26ec5048f368d293a6a71bf4a79a494ef2f0e57 (diff) | |
download | qt-creator-8e75e611a5f1e0aa4489cdf328cf91a916be08ef.tar.gz |
Move TextEditor::ToolTip to Utils
To enabled reuse from all plugins.
Change-Id: I1de68c8e6ed017d45f1248b2043f9611becc3b54
Reviewed-by: David Schulz <david.schulz@digia.com>
-rw-r--r-- | src/libs/utils/tooltip/effects.h (renamed from src/plugins/texteditor/tooltip/effects.h) | 0 | ||||
-rw-r--r-- | src/libs/utils/tooltip/reuse.h (renamed from src/plugins/texteditor/tooltip/reuse.h) | 4 | ||||
-rw-r--r-- | src/libs/utils/tooltip/tipcontents.cpp (renamed from src/plugins/texteditor/tooltip/tipcontents.cpp) | 4 | ||||
-rw-r--r-- | src/libs/utils/tooltip/tipcontents.h (renamed from src/plugins/texteditor/tooltip/tipcontents.h) | 14 | ||||
-rw-r--r-- | src/libs/utils/tooltip/tipfactory.cpp (renamed from src/plugins/texteditor/tooltip/tipfactory.cpp) | 4 | ||||
-rw-r--r-- | src/libs/utils/tooltip/tipfactory.h (renamed from src/plugins/texteditor/tooltip/tipfactory.h) | 4 | ||||
-rw-r--r-- | src/libs/utils/tooltip/tips.cpp (renamed from src/plugins/texteditor/tooltip/tips.cpp) | 8 | ||||
-rw-r--r-- | src/libs/utils/tooltip/tips.h (renamed from src/plugins/texteditor/tooltip/tips.h) | 14 | ||||
-rw-r--r-- | src/libs/utils/tooltip/tooltip.cpp (renamed from src/plugins/texteditor/tooltip/tooltip.cpp) | 4 | ||||
-rw-r--r-- | src/libs/utils/tooltip/tooltip.h (renamed from src/plugins/texteditor/tooltip/tooltip.h) | 8 | ||||
-rw-r--r-- | src/libs/utils/utils-lib.pri | 14 | ||||
-rw-r--r-- | src/libs/utils/utils.qbs | 19 | ||||
-rw-r--r-- | src/plugins/bookmarks/bookmarkmanager.cpp | 8 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppfunctiondecldeflink.cpp | 8 | ||||
-rw-r--r-- | src/plugins/debugger/debuggertooltipmanager.cpp | 10 | ||||
-rw-r--r-- | src/plugins/glsleditor/glsleditor.cpp | 1 | ||||
-rw-r--r-- | src/plugins/qmljseditor/qmljseditor.cpp | 1 | ||||
-rw-r--r-- | src/plugins/qmljseditor/qmljshoverhandler.cpp | 14 | ||||
-rw-r--r-- | src/plugins/qt4projectmanager/profilehoverhandler.cpp | 1 | ||||
-rw-r--r-- | src/plugins/texteditor/basehoverhandler.cpp | 10 | ||||
-rw-r--r-- | src/plugins/texteditor/basetexteditor.cpp | 12 | ||||
-rw-r--r-- | src/plugins/texteditor/texteditor.pro | 20 | ||||
-rw-r--r-- | src/plugins/texteditor/texteditor.qbs | 17 |
23 files changed, 94 insertions, 105 deletions
diff --git a/src/plugins/texteditor/tooltip/effects.h b/src/libs/utils/tooltip/effects.h index 26b2266bdb..26b2266bdb 100644 --- a/src/plugins/texteditor/tooltip/effects.h +++ b/src/libs/utils/tooltip/effects.h diff --git a/src/plugins/texteditor/tooltip/reuse.h b/src/libs/utils/tooltip/reuse.h index c76deffac1..be8aa2bb59 100644 --- a/src/plugins/texteditor/tooltip/reuse.h +++ b/src/libs/utils/tooltip/reuse.h @@ -36,7 +36,7 @@ #include <QApplication> #include <QDesktopWidget> -namespace TextEditor { +namespace Utils { namespace Internal { inline int screenNumber(const QPoint &pos, QWidget *w) @@ -57,6 +57,6 @@ inline QRect screenGeometry(const QPoint &pos, QWidget *w) } } // namespace Internal -} // namespace TextEditor +} // namespace Utils #endif // TOOLTIPREUSE_H diff --git a/src/plugins/texteditor/tooltip/tipcontents.cpp b/src/libs/utils/tooltip/tipcontents.cpp index 8153d8d5a2..99816475fc 100644 --- a/src/plugins/texteditor/tooltip/tipcontents.cpp +++ b/src/libs/utils/tooltip/tipcontents.cpp @@ -35,7 +35,7 @@ #include <QtGlobal> -namespace TextEditor { +namespace Utils { TipContent::TipContent() {} @@ -192,4 +192,4 @@ bool WidgetContent::pinToolTip(QWidget *w) return false; } -} // namespace TextEditor +} // namespace Utils diff --git a/src/plugins/texteditor/tooltip/tipcontents.h b/src/libs/utils/tooltip/tipcontents.h index 4843d62b86..7d07e2d857 100644 --- a/src/plugins/texteditor/tooltip/tipcontents.h +++ b/src/libs/utils/tooltip/tipcontents.h @@ -30,14 +30,14 @@ #ifndef TIPCONTENTS_H #define TIPCONTENTS_H -#include "texteditor/texteditor_global.h" +#include "../utils_global.h" #include <QString> #include <QColor> -namespace TextEditor { +namespace Utils { -class TEXTEDITOR_EXPORT TipContent +class QTCREATOR_UTILS_EXPORT TipContent { protected: TipContent(); @@ -53,7 +53,7 @@ public: virtual bool equals(const TipContent &tipContent) const = 0; }; -class TEXTEDITOR_EXPORT ColorContent : public TipContent +class QTCREATOR_UTILS_EXPORT ColorContent : public TipContent { public: ColorContent(const QColor &color); @@ -74,7 +74,7 @@ private: QColor m_color; }; -class TEXTEDITOR_EXPORT TextContent : public TipContent +class QTCREATOR_UTILS_EXPORT TextContent : public TipContent { public: TextContent(const QString &text); @@ -96,7 +96,7 @@ private: }; // A content for displaying any widget (with a layout). -class TEXTEDITOR_EXPORT WidgetContent : public TipContent +class QTCREATOR_UTILS_EXPORT WidgetContent : public TipContent { public: explicit WidgetContent(QWidget *w, bool interactive = false); @@ -123,6 +123,6 @@ private: bool m_interactive; }; -} // namespace TextEditor +} // namespace Utils #endif // TIPCONTENTS_H diff --git a/src/plugins/texteditor/tooltip/tipfactory.cpp b/src/libs/utils/tooltip/tipfactory.cpp index 584916e620..d070eb2a7e 100644 --- a/src/plugins/texteditor/tooltip/tipfactory.cpp +++ b/src/libs/utils/tooltip/tipfactory.cpp @@ -30,11 +30,11 @@ #include "tipfactory.h" #include "tipcontents.h" #include "tips.h" -#include <utils/qtcassert.h> +#include "qtcassert.h" #include <QVBoxLayout> -using namespace TextEditor; +using namespace Utils; using namespace Internal; TipFactory::TipFactory() diff --git a/src/plugins/texteditor/tooltip/tipfactory.h b/src/libs/utils/tooltip/tipfactory.h index 5e7c9b584d..1b8b78a2f0 100644 --- a/src/plugins/texteditor/tooltip/tipfactory.h +++ b/src/libs/utils/tooltip/tipfactory.h @@ -32,7 +32,7 @@ #include <QWidget> -namespace TextEditor { +namespace Utils { class TipContent; @@ -50,6 +50,6 @@ public: }; } // namespace Internal -} // namespace TextEditor +} // namespace Utils #endif // TIPFACTORY_H diff --git a/src/plugins/texteditor/tooltip/tips.cpp b/src/libs/utils/tooltip/tips.cpp index 4cf8947a9b..bc4b240a00 100644 --- a/src/plugins/texteditor/tooltip/tips.cpp +++ b/src/libs/utils/tooltip/tips.cpp @@ -31,7 +31,7 @@ #include "tipcontents.h" #include "reuse.h" -#include <utils/qtcassert.h> +#include "qtcassert.h" #include <QRect> #include <QColor> @@ -47,7 +47,7 @@ #include <QPaintEvent> #include <QVBoxLayout> -namespace TextEditor { +namespace Utils { namespace Internal { namespace { @@ -82,7 +82,7 @@ bool QTipLabel::isInteractive() const void QTipLabel::setContent(const TipContent &content) { - TextEditor::TipContent *tmpTipContent = m_tipContent; + Utils::TipContent *tmpTipContent = m_tipContent; m_tipContent = content.clone(); delete tmpTipContent; } @@ -266,4 +266,4 @@ bool WidgetTip::canHandleContentReplacement(const TipContent & ) const #include "moc_tips.cpp" } // namespace Internal -} // namespace TextEditor +} // namespace Utils diff --git a/src/plugins/texteditor/tooltip/tips.h b/src/libs/utils/tooltip/tips.h index 1341278fee..49c070affb 100644 --- a/src/plugins/texteditor/tooltip/tips.h +++ b/src/libs/utils/tooltip/tips.h @@ -36,12 +36,12 @@ QT_FORWARD_DECLARE_CLASS(QVBoxLayout) -namespace TextEditor { +namespace Utils { class TipContent; } #ifndef Q_MOC_RUN -namespace TextEditor { +namespace Utils { namespace Internal { #endif @@ -55,16 +55,16 @@ protected: public: virtual ~QTipLabel(); - void setContent(const TextEditor::TipContent &content); - const TextEditor::TipContent &content() const; + void setContent(const Utils::TipContent &content); + const Utils::TipContent &content() const; virtual void configure(const QPoint &pos, QWidget *w) = 0; - virtual bool canHandleContentReplacement(const TextEditor::TipContent &content) const = 0; + virtual bool canHandleContentReplacement(const Utils::TipContent &content) const = 0; bool isInteractive() const; private: - TextEditor::TipContent *m_tipContent; + Utils::TipContent *m_tipContent; }; class ColorTip : public QTipLabel @@ -118,7 +118,7 @@ private: #ifndef Q_MOC_RUN } // namespace Internal -} // namespace TextEditor +} // namespace Utils #endif #endif // TIPS_H diff --git a/src/plugins/texteditor/tooltip/tooltip.cpp b/src/libs/utils/tooltip/tooltip.cpp index 0fd7690f38..ddab4fdce4 100644 --- a/src/plugins/texteditor/tooltip/tooltip.cpp +++ b/src/libs/utils/tooltip/tooltip.cpp @@ -34,7 +34,7 @@ #include "effects.h" #include "reuse.h" -#include <utils/hostosinfo.h> +#include "hostosinfo.h" #include <QString> #include <QColor> @@ -45,7 +45,7 @@ #include <QDebug> -using namespace TextEditor; +using namespace Utils; using namespace Internal; ToolTip::ToolTip() : m_tipFactory(new TipFactory), m_tip(0), m_widget(0) diff --git a/src/plugins/texteditor/tooltip/tooltip.h b/src/libs/utils/tooltip/tooltip.h index 39e378a0ae..d4cadb1422 100644 --- a/src/plugins/texteditor/tooltip/tooltip.h +++ b/src/libs/utils/tooltip/tooltip.h @@ -30,7 +30,7 @@ #ifndef TOOLTIP_H #define TOOLTIP_H -#include "texteditor/texteditor_global.h" +#include "../utils_global.h" #include <QSharedPointer> #include <QObject> @@ -52,7 +52,7 @@ class QPoint; class QWidget; QT_END_NAMESPACE -namespace TextEditor { +namespace Utils { namespace Internal { class TipFactory; @@ -61,7 +61,7 @@ class QTipLabel; class TipContent; -class TEXTEDITOR_EXPORT ToolTip : public QObject +class QTCREATOR_UTILS_EXPORT ToolTip : public QObject { Q_OBJECT private: @@ -103,6 +103,6 @@ private: QTimer m_hideDelayTimer; }; -} // namespace TextEditor +} // namespace Utils #endif // TOOLTIP_H diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri index 4d5b6da62c..4a4553001b 100644 --- a/src/libs/utils/utils-lib.pri +++ b/src/libs/utils/utils-lib.pri @@ -4,7 +4,7 @@ dll { DEFINES += QTCREATOR_UTILS_STATIC_LIB } -INCLUDEPATH += $$PWD +INCLUDEPATH += $$PWD $$PWD/tooltip QT += script network CONFIG += exceptions # used by portlist.cpp, textfileformat.cpp, and ssh/* @@ -82,6 +82,10 @@ SOURCES += $$PWD/environment.cpp \ $$PWD/bracematcher.cpp \ $$PWD/proxyaction.cpp \ $$PWD/elidinglabel.cpp \ + $$PWD/tooltip/tooltip.cpp \ + $$PWD/tooltip/tips.cpp \ + $$PWD/tooltip/tipcontents.cpp \ + $$PWD/tooltip/tipfactory.cpp win32 { SOURCES += \ @@ -168,7 +172,13 @@ HEADERS += \ $$PWD/bracematcher.h \ $$PWD/proxyaction.h \ $$PWD/hostosinfo.h \ - $$PWD/elidinglabel.h + $$PWD/elidinglabel.h \ + $$PWD/tooltip/tooltip.h \ + $$PWD/tooltip/tips.h \ + $$PWD/tooltip/tipcontents.h \ + $$PWD/tooltip/reuse.h \ + $$PWD/tooltip/effects.h \ + $$PWD/tooltip/tipfactory.h FORMS += $$PWD/filewizardpage.ui \ $$PWD/projectintropage.ui \ diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index 79881b7eb2..0cc5a10086 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -5,6 +5,9 @@ QtcLibrary { name: "Utils" cpp.defines: base.concat(["QTCREATOR_UTILS_LIB", "QT_NO_CAST_FROM_ASCII"]) + cpp.includePaths: base.concat([ + "tooltip" + ]) Properties { condition: qbs.targetOS == "windows" @@ -179,6 +182,22 @@ QtcLibrary { ] Group { + prefix: "tooltip/" + files: [ + "effects.h", + "reuse.h", + "tipcontents.cpp", + "tipcontents.h", + "tipfactory.cpp", + "tipfactory.h", + "tips.cpp", + "tips.h", + "tooltip.cpp", + "tooltip.h", + ] + } + + Group { condition: qbs.targetOS == "windows" files: [ "consoleprocess_win.cpp", diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index 820586ebaf..dd4cc97d79 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -40,8 +40,8 @@ #include <projectexplorer/projectexplorer.h> #include <projectexplorer/session.h> #include <texteditor/basetexteditor.h> -#include <texteditor/tooltip/tooltip.h> -#include <texteditor/tooltip/tipcontents.h> +#include <utils/tooltip/tooltip.h> +#include <utils/tooltip/tipcontents.h> #include <utils/qtcassert.h> #include <QDebug> @@ -804,9 +804,9 @@ void BookmarkManager::operateTooltip(TextEditor::ITextEditor *textEditor, const return; if (mark->note().isEmpty()) - TextEditor::ToolTip::instance()->hide(); + Utils::ToolTip::instance()->hide(); else - TextEditor::ToolTip::instance()->show(pos, TextEditor::TextContent(mark->note()), textEditor->widget()); + Utils::ToolTip::instance()->show(pos, Utils::TextContent(mark->note()), textEditor->widget()); } /* Loads the bookmarks from the session settings. */ diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp index 1ceb5e233c..46c66466ba 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp +++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp @@ -44,8 +44,8 @@ #include <cpptools/cpprefactoringchanges.h> #include <cpptools/symbolfinder.h> #include <texteditor/refactoroverlay.h> -#include <texteditor/tooltip/tooltip.h> -#include <texteditor/tooltip/tipcontents.h> +#include <utils/tooltip/tooltip.h> +#include <utils/tooltip/tipcontents.h> #include <utils/qtcassert.h> #include <utils/proxyaction.h> #include <coreplugin/actionmanager/actionmanager.h> @@ -313,9 +313,9 @@ void FunctionDeclDefLink::apply(CPPEditorWidget *editor, bool jumpToMatch) } newTargetFile->apply(); } else { - TextEditor::ToolTip::instance()->show( + Utils::ToolTip::instance()->show( editor->toolTipPosition(linkSelection), - TextEditor::TextContent( + Utils::TextContent( tr("Target file was changed, could not apply changes"))); } } diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp index 8b6637f879..05185aeb60 100644 --- a/src/plugins/debugger/debuggertooltipmanager.cpp +++ b/src/plugins/debugger/debuggertooltipmanager.cpp @@ -44,9 +44,9 @@ #include <coreplugin/editormanager/editormanager.h> #include <texteditor/itexteditor.h> #include <texteditor/basetexteditor.h> -#include <texteditor/tooltip/tooltip.h> -#include <texteditor/tooltip/tipcontents.h> +#include <utils/tooltip/tooltip.h> +#include <utils/tooltip/tipcontents.h> #include <utils/qtcassert.h> #include <QToolButton> @@ -515,7 +515,7 @@ void DebuggerToolTipWidget::pin() if (parentWidget()) { // We are currently within a text editor tooltip: // Rip out of parent widget and re-show as a tooltip - WidgetContent::pinToolTip(this); + Utils::WidgetContent::pinToolTip(this); } else { // We have just be restored from session data. setWindowFlags(Qt::ToolTip); @@ -1128,8 +1128,8 @@ void DebuggerToolTipManager::showToolTip(const QPoint &p, IEditor *editor, QWidget *widget = editor->widget(); if (debugToolTipPositioning) qDebug() << "DebuggerToolTipManager::showToolTip" << p << " Mouse at " << QCursor::pos(); - const WidgetContent widgetContent(toolTipWidget, true); - ToolTip::instance()->show(p, widgetContent, widget); + const Utils::WidgetContent widgetContent(toolTipWidget, true); + Utils::ToolTip::instance()->show(p, widgetContent, widget); registerToolTip(toolTipWidget); } diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp index 7a209e5c07..9314a9d75b 100644 --- a/src/plugins/glsleditor/glsleditor.cpp +++ b/src/plugins/glsleditor/glsleditor.cpp @@ -57,7 +57,6 @@ #include <texteditor/texteditorsettings.h> #include <texteditor/syntaxhighlighter.h> #include <texteditor/refactoroverlay.h> -#include <texteditor/tooltip/tooltip.h> #include <qmldesigner/qmldesignerconstants.h> #include <utils/changeset.h> #include <utils/uncommentselection.h> diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index dfdb9da7d3..a8fa3b7f48 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -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> diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp index 1473666b5c..ab68fa5a46 100644 --- a/src/plugins/qmljseditor/qmljshoverhandler.cpp +++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp @@ -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()); } } diff --git a/src/plugins/qt4projectmanager/profilehoverhandler.cpp b/src/plugins/qt4projectmanager/profilehoverhandler.cpp index 7e4ca30f3e..73a9a176b3 100644 --- a/src/plugins/qt4projectmanager/profilehoverhandler.cpp +++ b/src/plugins/qt4projectmanager/profilehoverhandler.cpp @@ -38,7 +38,6 @@ #include <texteditor/itexteditor.h> #include <texteditor/basetexteditor.h> #include <texteditor/helpitem.h> -#include <texteditor/tooltip/tooltip.h> #include <utils/htmldocextractor.h> #include <QTextCursor> diff --git a/src/plugins/texteditor/basehoverhandler.cpp b/src/plugins/texteditor/basehoverhandler.cpp index 9a0627a69a..3a1f78201b 100644 --- a/src/plugins/texteditor/basehoverhandler.cpp +++ b/src/plugins/texteditor/basehoverhandler.cpp @@ -31,14 +31,14 @@ #include "itexteditor.h" #include "basetexteditor.h" #include "displaysettings.h" -#include "tooltip.h" -#include "tipcontents.h" #include <coreplugin/icore.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/helpmanager.h> #include <coreplugin/id.h> #include <debugger/debuggerconstants.h> +#include <utils/tooltip/tooltip.h> +#include <utils/tooltip/tipcontents.h> #include <QPoint> @@ -89,7 +89,7 @@ void BaseHoverHandler::updateContextHelpId(TextEditor::ITextEditor *editor, int // If the tooltip is visible and there is a help match, this match is used to update // the help id. Otherwise, let the identification process happen. - if (!ToolTip::instance()->isVisible() || !lastHelpItemIdentified().isValid()) + if (!Utils::ToolTip::instance()->isVisible() || !lastHelpItemIdentified().isValid()) process(editor, pos); if (lastHelpItemIdentified().isValid()) @@ -162,9 +162,9 @@ void BaseHoverHandler::decorateToolTip() void BaseHoverHandler::operateTooltip(ITextEditor *editor, const QPoint &point) { if (m_toolTip.isEmpty()) - ToolTip::instance()->hide(); + Utils::ToolTip::instance()->hide(); else - ToolTip::instance()->show(point, TextContent(m_toolTip), editor->widget()); + Utils::ToolTip::instance()->show(point, Utils::TextContent(m_toolTip), editor->widget()); } BaseTextEditorWidget *BaseHoverHandler::baseTextEditor(ITextEditor *editor) diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 1e718f1187..aeb89c6137 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -41,8 +41,6 @@ #include "texteditorconstants.h" #include "texteditorplugin.h" #include "syntaxhighlighter.h" -#include "tooltip.h" -#include "tipcontents.h" #include "indenter.h" #include "autocompleter.h" #include "snippet.h" @@ -70,6 +68,8 @@ #include <utils/hostosinfo.h> #include <utils/qtcassert.h> #include <utils/stylehelper.h> +#include <utils/tooltip/tooltip.h> +#include <utils/tooltip/tipcontents.h> #include <QCoreApplication> #include <QTextCodec> @@ -6388,7 +6388,7 @@ QString BaseTextEditor::contextHelpId() const return m_contextHelpId; } -Internal::RefactorMarkers BaseTextEditorWidget::refactorMarkers() const +RefactorMarkers BaseTextEditorWidget::refactorMarkers() const { return d->m_refactorOverlay->markers(); } @@ -6414,7 +6414,7 @@ void BaseTextEditorWidget::doFoo() { #endif } -void Internal::BaseTextBlockSelection::moveAnchor(int blockNumber, int visualColumn) +void BaseTextBlockSelection::moveAnchor(int blockNumber, int visualColumn) { if (visualColumn >= 0) { if (anchor % 2) { @@ -6451,7 +6451,7 @@ void Internal::BaseTextBlockSelection::moveAnchor(int blockNumber, int visualCol lastBlock.movePosition(QTextCursor::EndOfBlock); } -QTextCursor Internal::BaseTextBlockSelection::selection(const TabSettings &ts) const +QTextCursor BaseTextBlockSelection::selection(const TabSettings &ts) const { QTextCursor cursor = firstBlock; if (anchor <= TopRight) { @@ -6466,7 +6466,7 @@ QTextCursor Internal::BaseTextBlockSelection::selection(const TabSettings &ts) c return cursor; } -void Internal::BaseTextBlockSelection::fromSelection(const TabSettings &ts, const QTextCursor &selection) +void BaseTextBlockSelection::fromSelection(const TabSettings &ts, const QTextCursor &selection) { firstBlock = selection; firstBlock.setPosition(selection.selectionStart()); diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro index 62e660c874..d741a0e2bb 100644 --- a/src/plugins/texteditor/texteditor.pro +++ b/src/plugins/texteditor/texteditor.pro @@ -7,7 +7,6 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport include(../../qtcreatorplugin.pri) include(texteditor_dependencies.pri) INCLUDEPATH += generichighlighter \ - tooltip \ snippets \ codeassist SOURCES += texteditorplugin.cpp \ @@ -65,10 +64,6 @@ SOURCES += texteditorplugin.cpp \ refactoringchanges.cpp \ refactoroverlay.cpp \ outlinefactory.cpp \ - tooltip/tooltip.cpp \ - tooltip/tips.cpp \ - tooltip/tipcontents.cpp \ - tooltip/tipfactory.cpp \ basehoverhandler.cpp \ helpitem.cpp \ autocompleter.cpp \ @@ -180,12 +175,6 @@ HEADERS += texteditorplugin.h \ refactoroverlay.h \ outlinefactory.h \ ioutlinewidget.h \ - tooltip/tooltip.h \ - tooltip/tips.h \ - tooltip/tipcontents.h \ - tooltip/reuse.h \ - tooltip/effects.h \ - tooltip/tipfactory.h \ basehoverhandler.h \ helpitem.h \ autocompleter.h \ @@ -253,12 +242,3 @@ FORMS += \ RESOURCES += texteditor.qrc OTHER_FILES += TextEditor.mimetypes.xml - - - - - - - - - diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs index 7e07864e0f..b996e99737 100644 --- a/src/plugins/texteditor/texteditor.qbs +++ b/src/plugins/texteditor/texteditor.qbs @@ -14,7 +14,6 @@ QtcPlugin { cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"]) cpp.includePaths: base.concat([ "generichighlighter", - "tooltip", "snippets", "codeassist" ]) @@ -269,22 +268,6 @@ QtcPlugin { ] } - Group { - prefix: "tooltip/" - files: [ - "effects.h", - "reuse.h", - "tipcontents.cpp", - "tipcontents.h", - "tipfactory.cpp", - "tipfactory.h", - "tips.cpp", - "tips.h", - "tooltip.cpp", - "tooltip.h", - ] - } - ProductModule { Depends { name: "Find" } Depends { name: "Locator" } |