diff options
| -rw-r--r-- | src/kitemviews/kfileitemmodelrolesupdater.cpp | 10 | ||||
| -rw-r--r-- | src/kitemviews/kfileitemmodelrolesupdater.h | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index b157a0183..e539b45a0 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -611,10 +611,8 @@ void KFileItemModelRolesUpdater::slotPreviewFailed(const KFileItem& item) } } -void KFileItemModelRolesUpdater::slotPreviewJobFinished(KJob* job) +void KFileItemModelRolesUpdater::slotPreviewJobFinished() { - Q_UNUSED(job); - m_previewJob = 0; if (m_state != PreviewJobRunning) { @@ -912,7 +910,7 @@ void KFileItemModelRolesUpdater::startPreviewJob(const KFileItemList items) m_state = PreviewJobRunning; if (items.isEmpty()) { - QMetaObject::invokeMethod(this, "slotPreviewJobFinished", Qt::QueuedConnection, Q_ARG(KJob*, 0)); + QTimer::singleShot(0, this, SLOT(slotPreviewJobFinished())); return; } @@ -977,7 +975,7 @@ void KFileItemModelRolesUpdater::startPreviewJob(const KFileItemList items) connect(job, SIGNAL(failed(KFileItem)), this, SLOT(slotPreviewFailed(KFileItem))); connect(job, SIGNAL(finished(KJob*)), - this, SLOT(slotPreviewJobFinished(KJob*))); + this, SLOT(slotPreviewJobFinished())); m_previewJob = job; } @@ -1282,7 +1280,7 @@ void KFileItemModelRolesUpdater::killPreviewJob() disconnect(m_previewJob, SIGNAL(failed(KFileItem)), this, SLOT(slotPreviewFailed(KFileItem))); disconnect(m_previewJob, SIGNAL(finished(KJob*)), - this, SLOT(slotPreviewJobFinished(KJob*))); + this, SLOT(slotPreviewJobFinished())); m_previewJob->kill(); m_previewJob = 0; m_pendingPreviewItems.clear(); diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h b/src/kitemviews/kfileitemmodelrolesupdater.h index ea6ebb9b0..aa47f1756 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.h +++ b/src/kitemviews/kfileitemmodelrolesupdater.h @@ -185,7 +185,7 @@ private slots: * the changed items otherwise. * * @see startPreviewJob() */ - void slotPreviewJobFinished(KJob* job); + void slotPreviewJobFinished(); /** * Resolves the sort role of the next item in m_pendingSortRole, applies it |