X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/307285e9635a4bf584d6e5d7478876b90ef870f0..5e73577d6c3520fa3dfd63646795e628cf2a0614:/src/tooltips/tooltipmanager.cpp

diff --git a/src/tooltips/tooltipmanager.cpp b/src/tooltips/tooltipmanager.cpp
index 36a008f33..489c6c2b6 100644
--- a/src/tooltips/tooltipmanager.cpp
+++ b/src/tooltips/tooltipmanager.cpp
@@ -214,13 +214,11 @@ void ToolTipManager::showToolTip(KToolTipItem* tip)
     QSize size;
     if (m_previewIsLate) {
         QPixmap paddedImage(QSize(PREVIEW_WIDTH, PREVIEW_HEIGHT));
-        KToolTipItem* maxiTip = new KToolTipItem(paddedImage, m_item.getToolTipText());
-        size = g_delegate->sizeHint(&option, maxiTip);
-        delete maxiTip;
-        maxiTip = 0;
+        KToolTipItem maxiTip(paddedImage, m_item.getToolTipText());
+        size = g_delegate->sizeHint(option, maxiTip);
     }
-    else {
-        size = g_delegate->sizeHint(&option, tip);
+    else if (tip != 0) {
+        size = g_delegate->sizeHint(option, *tip);
     }
     const QRect desktop = QApplication::desktop()->screenGeometry(m_itemRect.bottomRight());
 
@@ -267,7 +265,6 @@ void ToolTipManager::startPreviewJob()
     KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << m_item,
                                             PREVIEW_WIDTH,
                                             PREVIEW_HEIGHT);
-    job->setIgnoreMaximumSize(true);
 
     connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
             this, SLOT(setPreviewPix(const KFileItem&, const QPixmap&)));