Port away from kdelibs4support

[dolphin.git] / src / views / tooltips / tooltipmanager.cpp

diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp
index 4a9f91359897c03c2565878bbe1d9b666d68a029..19c87b0847c95725fdb111ea8c977d64f45f1637 100644 (file)
--- a/src/views/tooltips/tooltipmanager.cpp
+++ b/src/views/tooltips/tooltipmanager.cpp
@@ -20,7 +20,7 @@
 #include "tooltipmanager.h"
 
 #include "dolphinfilemetadatawidget.h"
 #include "tooltipmanager.h"
 
 #include "dolphinfilemetadatawidget.h"

-#include <QIcon>
+

 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
 #include <KJobWidgets>
 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
 #include <KJobWidgets>


@@ -28,6 +28,7 @@
 
 #include <QApplication>
 #include <QDesktopWidget>
 
 #include <QApplication>
 #include <QDesktopWidget>

+#include <QIcon>

 #include <QLayout>
 #include <QStyle>
 #include <QTimer>
 #include <QLayout>
 #include <QStyle>
 #include <QTimer>


@@ -35,11 +36,10 @@
 
 ToolTipManager::ToolTipManager(QWidget* parent) :
     QObject(parent),
 
 ToolTipManager::ToolTipManager(QWidget* parent) :
     QObject(parent),

-    m_showToolTipTimer(0),
-    m_contentRetrievalTimer(0),
-    m_transientParent(0),
-    m_fileMetaDataWidget(0),
-    m_tooltipWidget(new KToolTipWidget()),
+    m_showToolTipTimer(nullptr),
+    m_contentRetrievalTimer(nullptr),
+    m_transientParent(nullptr),
+    m_fileMetaDataWidget(nullptr),

     m_toolTipRequested(false),
     m_metaDataRequested(false),
     m_appliedWaitCursor(false),
     m_toolTipRequested(false),
     m_metaDataRequested(false),
     m_appliedWaitCursor(false),


@@ -86,6 +86,8 @@ void ToolTipManager::showToolTip(const KFileItem& item, const QRectF& itemRect,
     m_fileMetaDataWidget = new DolphinFileMetaDataWidget();
     connect(m_fileMetaDataWidget, &DolphinFileMetaDataWidget::metaDataRequestFinished,
             this, &ToolTipManager::slotMetaDataRequestFinished);
     m_fileMetaDataWidget = new DolphinFileMetaDataWidget();
     connect(m_fileMetaDataWidget, &DolphinFileMetaDataWidget::metaDataRequestFinished,
             this, &ToolTipManager::slotMetaDataRequestFinished);

+    connect(m_fileMetaDataWidget, &DolphinFileMetaDataWidget::urlActivated,
+            this, &ToolTipManager::urlActivated);

 
     m_contentRetrievalTimer->start();
     m_showToolTipTimer->start();
 
     m_contentRetrievalTimer->start();
     m_showToolTipTimer->start();


@@ -104,7 +106,9 @@ void ToolTipManager::hideToolTip()
     m_metaDataRequested = false;
     m_showToolTipTimer->stop();
     m_contentRetrievalTimer->stop();
     m_metaDataRequested = false;
     m_showToolTipTimer->stop();
     m_contentRetrievalTimer->stop();

-    m_tooltipWidget->hideLater();
+    if (m_tooltipWidget) {
+        m_tooltipWidget->hideLater();
+    }

 }
 
 void ToolTipManager::startContentRetrieval()
 }
 
 void ToolTipManager::startContentRetrieval()


@@ -199,6 +203,9 @@ void ToolTipManager::showToolTip()
 
     // Adjust the size to get a proper sizeHint()
     m_fileMetaDataWidget->adjustSize();
 
     // Adjust the size to get a proper sizeHint()
     m_fileMetaDataWidget->adjustSize();

+    if (!m_tooltipWidget) {
+        m_tooltipWidget.reset(new KToolTipWidget());
+    }

     m_tooltipWidget->showBelow(m_itemRect, m_fileMetaDataWidget, m_transientParent);
     m_toolTipRequested = false;
 }
     m_tooltipWidget->showBelow(m_itemRect, m_fileMetaDataWidget, m_transientParent);
     m_toolTipRequested = false;
 }