Merge branch 'Applications/16.12'

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

diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp
index c005979d56f3ec375ef8295007fbb9c2b957349b..404d6801cc3dd00a2f64d6f0d1f3e0893bcbb467 100644 (file)
--- a/src/views/tooltips/tooltipmanager.cpp
+++ b/src/views/tooltips/tooltipmanager.cpp
@@ -20,7 +20,7 @@
 #include "tooltipmanager.h"
 
 #include "filemetadatatooltip.h"
-#include <KIcon>
+#include <QIcon>
 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
 #include <KJobWidgets>
@@ -28,8 +28,6 @@
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QLayout>
-#include <QScrollArea>
-#include <QScrollBar>
 #include <QStyle>
 #include <QTimer>
 
@@ -132,7 +130,7 @@ void ToolTipManager::startContentRetrieval()
 
     KIO::PreviewJob* job = new KIO::PreviewJob(KFileItemList() << m_item, QSize(256, 256));
     job->setIgnoreMaximumSize(m_item.isLocalFile());
-    if (job->ui()) {
+    if (job->uiDelegate()) {
         KJobWidgets::setWindow(job, qApp->activeWindow());
     }
 
@@ -167,7 +165,7 @@ void ToolTipManager::previewFailed()
         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();