diff --git a/src/widgets/kdirmodel.h b/src/widgets/kdirmodel.h --- a/src/widgets/kdirmodel.h +++ b/src/widgets/kdirmodel.h @@ -272,13 +272,6 @@ private: friend class KDirModelPrivate; KDirModelPrivate *const d; - - Q_PRIVATE_SLOT(d, void _k_slotNewItems(const QUrl &, const KFileItemList &)) - Q_PRIVATE_SLOT(d, void _k_slotDeleteItems(const KFileItemList &)) - Q_PRIVATE_SLOT(d, void _k_slotRefreshItems(const QList > &)) - Q_PRIVATE_SLOT(d, void _k_slotClear()) - Q_PRIVATE_SLOT(d, void _k_slotRedirection(const QUrl &, const QUrl &)) - Q_PRIVATE_SLOT(d, void _k_slotJobUrlsChanged(const QStringList &)) }; Q_DECLARE_OPERATORS_FOR_FLAGS(KDirModel::DropsAllowed) diff --git a/src/widgets/kdirmodel.cpp b/src/widgets/kdirmodel.cpp --- a/src/widgets/kdirmodel.cpp +++ b/src/widgets/kdirmodel.cpp @@ -404,16 +404,16 @@ } d->m_dirLister = dirLister; d->m_dirLister->setParent(this); - connect(d->m_dirLister, SIGNAL(itemsAdded(QUrl,KFileItemList)), - this, SLOT(_k_slotNewItems(QUrl,KFileItemList))); - connect(d->m_dirLister, SIGNAL(itemsDeleted(KFileItemList)), - this, SLOT(_k_slotDeleteItems(KFileItemList))); - connect(d->m_dirLister, SIGNAL(refreshItems(QList >)), - this, SLOT(_k_slotRefreshItems(QList >))); - connect(d->m_dirLister, SIGNAL(clear()), - this, SLOT(_k_slotClear())); - connect(d->m_dirLister, SIGNAL(redirection(QUrl,QUrl)), - this, SLOT(_k_slotRedirection(QUrl,QUrl))); + connect(d->m_dirLister, &KCoreDirLister::itemsAdded, this, + [this](const QUrl &dirUrl, const KFileItemList &items){d->_k_slotNewItems(dirUrl, items);} ); + connect(d->m_dirLister, &KCoreDirLister::itemsDeleted, this, + [this](const KFileItemList &items){d->_k_slotDeleteItems(items);} ); + connect(d->m_dirLister, &KCoreDirLister::refreshItems, this, + [this](const QList > &items){d->_k_slotRefreshItems(items);} ); + connect(d->m_dirLister, QOverload<>::of(&KCoreDirLister::clear), this, + [this](){d->_k_slotClear();} ); + connect(d->m_dirLister, QOverload::of(&KCoreDirLister::redirection), this, + [this](const QUrl &oldUrl, const QUrl &newUrl){d->_k_slotRedirection(oldUrl, newUrl);} ); } KDirLister *KDirModel::dirLister() const