From e5dbf9a35944da4b89ce88cb58a2ef47ca686aba Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 3 Oct 2016 23:38:18 +0400 Subject: [PATCH] Delete unused tooltip code (#81) --- lib/Filter.cpp | 17 ----------------- lib/Filter.h | 9 --------- lib/TerminalDisplay.cpp | 8 -------- 3 files changed, 34 deletions(-) diff --git a/lib/Filter.cpp b/lib/Filter.cpp index c113eb3..275d710 100644 --- a/lib/Filter.cpp +++ b/lib/Filter.cpp @@ -287,10 +287,6 @@ Filter::HotSpot::HotSpot(int startLine , int startColumn , int endLine , int end , _type(NotSpecified) { } -QString Filter::HotSpot::tooltip() const -{ - return QString(); -} QList Filter::HotSpot::actions() { return QList(); @@ -418,19 +414,6 @@ UrlFilter::HotSpot::HotSpot(int startLine,int startColumn,int endLine,int endCol setType(Link); } -QString UrlFilter::HotSpot::tooltip() const -{ - QString url = capturedTexts().first(); - - const UrlType kind = urlType(); - - if ( kind == StandardUrl ) - return QString(); - else if ( kind == Email ) - return QString(); - else - return QString(); -} UrlFilter::HotSpot::UrlType UrlFilter::HotSpot::urlType() const { QString url = capturedTexts().first(); diff --git a/lib/Filter.h b/lib/Filter.h index 4c3b8ef..7f364db 100644 --- a/lib/Filter.h +++ b/lib/Filter.h @@ -117,14 +117,6 @@ public: */ virtual QList actions(); - /** - * Returns the text of a tooltip to be shown when the mouse moves over the hotspot, or - * an empty string if there is no tooltip associated with this hotspot. - * - * The default implementation returns an empty string. - */ - virtual QString tooltip() const; - protected: /** Sets the type of a hotspot. This should only be set once */ void setType(Type type); @@ -272,7 +264,6 @@ public: */ virtual void activate(const QString& action = QString()); - virtual QString tooltip() const; private: enum UrlType { diff --git a/lib/TerminalDisplay.cpp b/lib/TerminalDisplay.cpp index c524802..4f7e0aa 100644 --- a/lib/TerminalDisplay.cpp +++ b/lib/TerminalDisplay.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include @@ -1865,13 +1864,6 @@ void TerminalDisplay::mouseMoveEvent(QMouseEvent* ev) (spot->endLine()+1)*_fontHeight ); _mouseOverHotspotArea |= r; } - // display tooltips when mousing over links - // TODO: Extend this to work with filter types other than links - const QString& tooltip = spot->tooltip(); - if ( !tooltip.isEmpty() ) - { - QToolTip::showText( mapToGlobal(ev->pos()) , tooltip , this , _mouseOverHotspotArea.boundingRect() ); - } update( _mouseOverHotspotArea | previousHotspotArea ); }