Ported KIcon to QIcon

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

diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp
index 8b2e98dae3c59c03f65d2216a4af52dc334dcbb5..25fa8e0ed450cf2b49a01c4e734f5257c412b810 100644 (file)
--- a/src/views/tooltips/tooltipmanager.cpp
+++ b/src/views/tooltips/tooltipmanager.cpp
@@ -20,8 +20,10 @@
 #include "tooltipmanager.h"
 
 #include "filemetadatatooltip.h"
 #include "tooltipmanager.h"
 
 #include "filemetadatatooltip.h"

-#include <KIcon>
+#include <QIcon>
+#include <KIO/JobUiDelegate>

 #include <KIO/PreviewJob>
 #include <KIO/PreviewJob>

+#include <KJobWidgets>

 
 #include <QApplication>
 #include <QDesktopWidget>
 
 #include <QApplication>
 #include <QDesktopWidget>


@@ -50,12 +52,12 @@ ToolTipManager::ToolTipManager(QWidget* parent) :
     m_showToolTipTimer = new QTimer(this);
     m_showToolTipTimer->setSingleShot(true);
     m_showToolTipTimer->setInterval(500);
     m_showToolTipTimer = new QTimer(this);
     m_showToolTipTimer->setSingleShot(true);
     m_showToolTipTimer->setInterval(500);

-    connect(m_showToolTipTimer, SIGNAL(timeout()), this, SLOT(showToolTip()));
+    connect(m_showToolTipTimer, &QTimer::timeout, this, static_cast<void(ToolTipManager::*)()>(&ToolTipManager::showToolTip));

 
     m_contentRetrievalTimer = new QTimer(this);
     m_contentRetrievalTimer->setSingleShot(true);
     m_contentRetrievalTimer->setInterval(200);
 
     m_contentRetrievalTimer = new QTimer(this);
     m_contentRetrievalTimer->setSingleShot(true);
     m_contentRetrievalTimer->setInterval(200);

-    connect(m_contentRetrievalTimer, SIGNAL(timeout()), this, SLOT(startContentRetrieval()));
+    connect(m_contentRetrievalTimer, &QTimer::timeout, this, &ToolTipManager::startContentRetrieval);

 
     Q_ASSERT(m_contentRetrievalTimer->interval() < m_showToolTipTimer->interval());
 }
 
     Q_ASSERT(m_contentRetrievalTimer->interval() < m_showToolTipTimer->interval());
 }


@@ -80,8 +82,8 @@ void ToolTipManager::showToolTip(const KFileItem& item, const QRectF& itemRect)
     // meta data retrieval, when passing rapidly over a lot of items.
     Q_ASSERT(!m_fileMetaDataToolTip);
     m_fileMetaDataToolTip = new FileMetaDataToolTip();
     // meta data retrieval, when passing rapidly over a lot of items.
     Q_ASSERT(!m_fileMetaDataToolTip);
     m_fileMetaDataToolTip = new FileMetaDataToolTip();

-    connect(m_fileMetaDataToolTip, SIGNAL(metaDataRequestFinished(KFileItemList)),
-            this, SLOT(slotMetaDataRequestFinished()));
+    connect(m_fileMetaDataToolTip, &FileMetaDataToolTip::metaDataRequestFinished,
+            this, &ToolTipManager::slotMetaDataRequestFinished);

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


@@ -103,7 +105,9 @@ void ToolTipManager::hideToolTip()
 
     if (m_fileMetaDataToolTip) {
         m_fileMetaDataToolTip->hide();
 
     if (m_fileMetaDataToolTip) {
         m_fileMetaDataToolTip->hide();

-        delete m_fileMetaDataToolTip;
+        // Do not delete the tool tip immediately to prevent crashes when
+        // QCoreApplication tries to deliver an 'Enter' event to it, see bug 310579.
+        m_fileMetaDataToolTip->deleteLater();

         m_fileMetaDataToolTip = 0;
     }
 }
         m_fileMetaDataToolTip = 0;
     }
 }


@@ -128,11 +132,14 @@ void ToolTipManager::startContentRetrieval()
 
     KIO::PreviewJob* job = new KIO::PreviewJob(KFileItemList() << m_item, QSize(256, 256));
     job->setIgnoreMaximumSize(m_item.isLocalFile());
 
     KIO::PreviewJob* job = new KIO::PreviewJob(KFileItemList() << m_item, QSize(256, 256));
     job->setIgnoreMaximumSize(m_item.isLocalFile());

+    if (job->ui()) {
+        KJobWidgets::setWindow(job, qApp->activeWindow());
+    }

 
 

-    connect(job, SIGNAL(gotPreview(KFileItem,QPixmap)),
-            this, SLOT(setPreviewPix(KFileItem,QPixmap)));
-    connect(job, SIGNAL(failed(KFileItem)),
-            this, SLOT(previewFailed()));
+    connect(job, &KIO::PreviewJob::gotPreview,
+            this, &ToolTipManager::setPreviewPix);
+    connect(job, &KIO::PreviewJob::failed,
+            this, &ToolTipManager::previewFailed);

 }
 
 
 }
 
 


@@ -160,7 +167,7 @@ void ToolTipManager::previewFailed()
         return;
     }
 
         return;
     }
 

-    const QPixmap pixmap = KIcon(m_item.iconName()).pixmap(128, 128);
+    const QPixmap pixmap = QIcon::fromTheme(m_item.iconName()).pixmap(128, 128);

     m_fileMetaDataToolTip->setPreview(pixmap);
     if (!m_showToolTipTimer->isActive()) {
         showToolTip();
     m_fileMetaDataToolTip->setPreview(pixmap);
     if (!m_showToolTipTimer->isActive()) {
         showToolTip();


@@ -260,4 +267,3 @@ void ToolTipManager::showToolTip()
     m_toolTipRequested = false;
 }
 
     m_toolTipRequested = false;
 }
 

-#include "tooltipmanager.moc"