diff --git a/src/core/listjob.h b/src/core/listjob.h --- a/src/core/listjob.h +++ b/src/core/listjob.h @@ -103,12 +103,6 @@ protected: ListJob(ListJobPrivate &dd); - -private: - Q_PRIVATE_SLOT(d_func(), void slotListEntries(const KIO::UDSEntryList &list)) - Q_PRIVATE_SLOT(d_func(), void slotRedirection(const QUrl &url)) - Q_PRIVATE_SLOT(d_func(), void gotEntries(KIO::Job *subjob, const KIO::UDSEntryList &list)) - Q_PRIVATE_SLOT(d_func(), void slotSubError(KIO::ListJob* job, KIO::ListJob* subJob)) Q_DECLARE_PRIVATE(ListJob) }; diff --git a/src/core/listjob.cpp b/src/core/listjob.cpp --- a/src/core/listjob.cpp +++ b/src/core/listjob.cpp @@ -136,10 +136,11 @@ m_displayPrefix + displayName + '/', includeHidden); Scheduler::setJobPriority(job, 1); - q->connect(job, SIGNAL(entries(KIO::Job*,KIO::UDSEntryList)), - SLOT(gotEntries(KIO::Job*,KIO::UDSEntryList))); - q->connect(job, SIGNAL(subError(KIO::ListJob*,KIO::ListJob*)), - SLOT(slotSubError(KIO::ListJob*,KIO::ListJob*))); + QObject::connect(job, &ListJob::entries, q, + [this](KIO::Job *job, const KIO::UDSEntryList &list) {gotEntries(job, list);} ); + QObject::connect(job, &ListJob::subError, q, + [this](KIO::ListJob *job, KIO::ListJob *ljob) {slotSubError(job, ljob);} ); + q->addSubjob(job); } } @@ -283,12 +284,14 @@ QTimer::singleShot(0, q, SLOT(slotFinished())); return; } - q->connect(slave, SIGNAL(listEntries(KIO::UDSEntryList)), - SLOT(slotListEntries(KIO::UDSEntryList))); - q->connect(slave, SIGNAL(totalSize(KIO::filesize_t)), - SLOT(slotTotalSize(KIO::filesize_t))); - q->connect(slave, SIGNAL(redirection(QUrl)), - SLOT(slotRedirection(QUrl))); + QObject::connect(slave, &Slave::listEntries, q, + [this](const KIO::UDSEntryList &list){ slotListEntries(list);} ); + + QObject::connect(slave, &Slave::totalSize, q, + [this](KIO::filesize_t size){ slotTotalSize(size);} ); + + QObject::connect(slave, &Slave::redirection, q, + [this](const QUrl &url){ slotRedirection(url);} ); SimpleJobPrivate::start(slave); }