diff --git a/dolphin/src/kitemviews/kfileitemmodel.cpp b/dolphin/src/kitemviews/kfileitemmodel.cpp index 1df69c4f..6fdd45a6 100644 --- a/dolphin/src/kitemviews/kfileitemmodel.cpp +++ b/dolphin/src/kitemviews/kfileitemmodel.cpp @@ -120,11 +120,6 @@ void KFileItemModel::loadDirectory(const KUrl& url) m_dirLister->openUrl(url); } -void KFileItemModel::refreshDirectory(const KUrl& url) -{ - m_dirLister->openUrl(url, KDirLister::Reload); -} - KUrl KFileItemModel::directory() const { return m_dirLister->url(); diff --git a/dolphin/src/kitemviews/kfileitemmodel.h b/dolphin/src/kitemviews/kfileitemmodel.h index cc7cf058..84195b07 100644 --- a/dolphin/src/kitemviews/kfileitemmodel.h +++ b/dolphin/src/kitemviews/kfileitemmodel.h @@ -58,12 +58,6 @@ public: */ void loadDirectory(const KUrl& url); - /** - * Throws away all currently loaded items and refreshes the directory - * by reloading all items again. - */ - void refreshDirectory(const KUrl& url); - /** * @return Parent directory of the items that are shown. In case * if a directory tree is shown, KFileItemModel::dir() returns @@ -74,7 +68,7 @@ public: /** * Cancels the loading of a directory which has been started by either - * loadDirectory() or refreshDirectory(). + * loadDirectory(). */ void cancelDirectoryLoading(); diff --git a/dolphin/src/kitemviews/private/kdirectorycontentscounter.h b/dolphin/src/kitemviews/private/kdirectorycontentscounter.h index 53c0ab7c..dc0ddc55 100644 --- a/dolphin/src/kitemviews/private/kdirectorycontentscounter.h +++ b/dolphin/src/kitemviews/private/kdirectorycontentscounter.h @@ -25,10 +25,10 @@ #include #include +#include class KDirWatch; class KFileItemModel; -#include class KDirectoryContentsCounter : public QObject { diff --git a/dolphin/src/views/dolphinview.cpp b/dolphin/src/views/dolphinview.cpp index e5181cb0..3e931c84 100644 --- a/dolphin/src/views/dolphinview.cpp +++ b/dolphin/src/views/dolphinview.cpp @@ -460,7 +460,7 @@ void DolphinView::reload() m_selectedUrls = itemList.urlList(); setUrl(url()); - loadDirectory(url(), true); + loadDirectory(url()); QDataStream restoreStream(viewState); restoreState(restoreStream); @@ -1429,7 +1429,7 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, con } } -void DolphinView::loadDirectory(const KUrl& url, bool reload) +void DolphinView::loadDirectory(const KUrl& url) { if (!url.isValid()) { const QString location(url.pathOrUrl()); @@ -1441,11 +1441,7 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload) return; } - if (reload) { - m_model->refreshDirectory(url); - } else { - m_model->loadDirectory(url); - } + m_model->loadDirectory(url); } void DolphinView::applyViewProperties() diff --git a/dolphin/src/views/dolphinview.h b/dolphin/src/views/dolphinview.h index 880bdc31..7222cc6e 100644 --- a/dolphin/src/views/dolphinview.h +++ b/dolphin/src/views/dolphinview.h @@ -679,7 +679,7 @@ private slots: void calculateItemCount(int& fileCount, int& folderCount, KIO::filesize_t& totalFileSize) const; private: - void loadDirectory(const KUrl& url, bool reload = false); + void loadDirectory(const KUrl& url); /** * Applies the view properties which are defined by the current URL