Remove unused argument

I saw a runtime warning from QMetaObject::invokeMethod() that KJob* is
not a registered type. Since we don't use that argument in
slotPreviewJobFinished(KJob*) anyway, it's best to remove it.

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index b157a018370b95df6bec2955eacc79d2238baa67..e539b45a08dc06d23dd60c7d4047eb67317fe16c 100644 (file)
--- 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) {
     m_previewJob = 0;
 
     if (m_state != PreviewJobRunning) {


@@ -912,7 +910,7 @@ void KFileItemModelRolesUpdater::startPreviewJob(const KFileItemList items)
     m_state = PreviewJobRunning;
 
     if (items.isEmpty()) {
     m_state = PreviewJobRunning;
 
     if (items.isEmpty()) {

-        QMetaObject::invokeMethod(this, "slotPreviewJobFinished", Qt::QueuedConnection, Q_ARG(KJob*, 0));
+        QTimer::singleShot(0, this, SLOT(slotPreviewJobFinished()));

         return;
     }
 
         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*)),
     connect(job,  SIGNAL(failed(KFileItem)),
             this, SLOT(slotPreviewFailed(KFileItem)));
     connect(job,  SIGNAL(finished(KJob*)),

-            this, SLOT(slotPreviewJobFinished(KJob*)));
+            this, SLOT(slotPreviewJobFinished()));

 
     m_previewJob = job;
 }
 
     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*)),
         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();
         m_previewJob->kill();
         m_previewJob = 0;
         m_pendingPreviewItems.clear();

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h b/src/kitemviews/kfileitemmodelrolesupdater.h
index ea6ebb9b067178a12abd9df209149c7a471b3b40..aa47f175628db1a9b24487a487ada7ef0a271642 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.h
+++ b/src/kitemviews/kfileitemmodelrolesupdater.h
@@ -185,7 +185,7 @@ private slots:
      * the changed items otherwise.     *
      * @see startPreviewJob()
      */
      * 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
 
     /**
      * Resolves the sort role of the next item in m_pendingSortRole, applies it