fixed issue that turning off the preview during the preview job still was active did not work as expected

TODO for 4.1: provide a preview helper class which can be shared between DolphinView and the special use case of DolphinColumnViewWidget

BUG: 153816

svn path=/trunk/KDE/kdebase/apps/; revision=747348

1 files changed, 13 insertions, 1 deletions

diff --git a/src/dolphinview.h b/src/dolphinview.h
index 508862e9c..3cd7860f1 100644
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -52,6 +52,10 @@ class DolphinMainWindow;
 class DolphinSortFilterProxyModel;
 class QModelIndex;
 class ViewProperties;
+namespace KIO
+{
+    class PreviewJob;
+}
 
 /**
  * @short Represents a view for the directory content.
@@ -541,7 +545,7 @@ private slots:
      * Replaces the icon of the item \a item by the preview pixmap
      * \a pixmap.
      */
-    void showPreview(const KFileItem& item, const QPixmap& pixmap);
+    void replaceIcon(const KFileItem& item, const QPixmap& pixmap);
 
     void emitSelectionChangedSignal();
 
@@ -614,6 +618,12 @@ private slots:
      */
     void slotDeleteFileFinished(KJob* job);
 
+    /**
+     * Is invoked when the preview job has been finished and
+     * set m_previewJob to 0.
+     */
+    void slotPreviewJobFinished(KJob* job);
+
 private:
     void loadDirectory(const KUrl& url, bool reload = false);
 
@@ -696,6 +706,8 @@ private:
     KDirLister* m_dirLister;
     DolphinSortFilterProxyModel* m_proxyModel;
 
+    KIO::PreviewJob* m_previewJob;
+
     QList<CutItem> m_cutItemsCache;
 
     KUrl m_rootUrl;