gwenview: adjust to KDirLister changes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/gwenview/app/folderviewcontextmanageritem.cpp b/gwenview/app/folderviewcontextmanageritem.cpp
index c5cbb77..dd9ed0b 100644 (file)
--- a/gwenview/app/folderviewcontextmanageritem.cpp
+++ b/gwenview/app/folderviewcontextmanageritem.cpp
@@ -41,7 +41,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #include <lib/placetreemodel.h>
 #define MODEL_CLASS PlaceTreeModel
 #else
-#include <KDirLister>
 #include <lib/semanticinfo/sorteddirmodel.h>
 #define MODEL_CLASS SortedDirModel
 #endif

diff --git a/gwenview/importer/documentdirfinder.cpp b/gwenview/importer/documentdirfinder.cpp
index 70d9dd2..b1f3b1b 100644 (file)
--- a/gwenview/importer/documentdirfinder.cpp
+++ b/gwenview/importer/documentdirfinder.cpp
@@ -46,8 +46,8 @@ DocumentDirFinder::DocumentDirFinder(const KUrl& rootUrl)
 {
     d->mRootUrl = rootUrl;
     d->mDirLister = new KDirLister(this);
-    connect(d->mDirLister, SIGNAL(itemsAdded(KUrl,KFileItemList)),
-            SLOT(slotItemsAdded(KUrl,KFileItemList)));
+    connect(d->mDirLister, SIGNAL(itemsAdded(KFileItemList)),
+            SLOT(slotItemsAdded(KFileItemList)));
     connect(d->mDirLister, SIGNAL(completed()),
             SLOT(slotCompleted()));
     d->mDirLister->openUrl(rootUrl);
@@ -63,8 +63,9 @@ void DocumentDirFinder::start()
     d->mDirLister->openUrl(d->mRootUrl);
 }
 
-void DocumentDirFinder::slotItemsAdded(const KUrl& dir, const KFileItemList& list)
+void DocumentDirFinder::slotItemsAdded(const KFileItemList& list)
 {
+    const KUrl dir = d->mDirLister->url();
     Q_FOREACH(const KFileItem & item, list) {
         MimeTypeUtils::Kind kind = MimeTypeUtils::fileItemKind(item);
         switch (kind) {

diff --git a/gwenview/importer/documentdirfinder.h b/gwenview/importer/documentdirfinder.h
index 4c01e0c..d5b1e2a 100644 (file)
--- a/gwenview/importer/documentdirfinder.h
+++ b/gwenview/importer/documentdirfinder.h
@@ -64,7 +64,7 @@ Q_SIGNALS:
     void done(const KUrl&, DocumentDirFinder::Status);
 
 private Q_SLOTS:
-    void slotItemsAdded(const KUrl&, const KFileItemList&);
+    void slotItemsAdded(const KFileItemList&);
     void slotCompleted();
 
 private:

diff --git a/gwenview/lib/recursivedirmodel.cpp b/gwenview/lib/recursivedirmodel.cpp
index cb4a851..16d943b 100644 (file)
--- a/gwenview/lib/recursivedirmodel.cpp
+++ b/gwenview/lib/recursivedirmodel.cpp
@@ -85,16 +85,14 @@ RecursiveDirModel::RecursiveDirModel(QObject* parent)
 , d(new RecursiveDirModelPrivate)
 {
     d->mDirLister = new KDirLister(this);
-    connect(d->mDirLister, SIGNAL(itemsAdded(KUrl, KFileItemList)),
-        SLOT(slotItemsAdded(KUrl, KFileItemList)));
+    connect(d->mDirLister, SIGNAL(itemsAdded(KFileItemList)),
+        SLOT(slotItemsAdded(KFileItemList)));
     connect(d->mDirLister, SIGNAL(itemsDeleted(KFileItemList)),
         SLOT(slotItemsDeleted(KFileItemList)));
     connect(d->mDirLister, SIGNAL(completed()),
         SIGNAL(completed()));
     connect(d->mDirLister, SIGNAL(clear()),
         SLOT(slotCleared()));
-    connect(d->mDirLister, SIGNAL(clear(KUrl)),
-        SLOT(slotDirCleared(KUrl)));
 }
 
 RecursiveDirModel::~RecursiveDirModel()
@@ -148,7 +146,7 @@ QVariant RecursiveDirModel::data(const QModelIndex& index, int role) const
     return QVariant();
 }
 
-void RecursiveDirModel::slotItemsAdded(const KUrl&, const KFileItemList& newList)
+void RecursiveDirModel::slotItemsAdded(const KFileItemList& newList)
 {
     QList<KUrl> dirUrls;
     KFileItemList fileList;
@@ -203,17 +201,4 @@ void RecursiveDirModel::slotCleared()
     endResetModel();
 }
 
-void RecursiveDirModel::slotDirCleared(const KUrl& dirUrl)
-{
-    int row;
-    for (row = d->list().count() - 1; row >= 0; --row) {
-        const KUrl url = d->list().at(row).url();
-        if (dirUrl.isParentOf(url)) {
-            beginRemoveRows(QModelIndex(), row, row);
-            d->removeAt(row);
-            endRemoveRows();
-        }
-    }
-}
-
 } // namespace

diff --git a/gwenview/lib/recursivedirmodel.h b/gwenview/lib/recursivedirmodel.h
index 36f2e35..71dac08 100644 (file)
--- a/gwenview/lib/recursivedirmodel.h
+++ b/gwenview/lib/recursivedirmodel.h
@@ -56,9 +56,8 @@ Q_SIGNALS:
     void completed();
 
 private Q_SLOTS:
-    void slotItemsAdded(const KUrl& dirUrl, const KFileItemList&);
+    void slotItemsAdded(const KFileItemList&);
     void slotItemsDeleted(const KFileItemList&);
-    void slotDirCleared(const KUrl&);
     void slotCleared();
 private:
     RecursiveDirModelPrivate* const d;

diff --git a/gwenview/lib/sorteddirmodel.cpp b/gwenview/lib/sorteddirmodel.cpp
index ffbb26d..8c318ed 100644 (file)
--- a/gwenview/lib/sorteddirmodel.cpp
+++ b/gwenview/lib/sorteddirmodel.cpp
@@ -119,7 +119,7 @@ KDirLister* SortedDirModel::dirLister() const
 
 void SortedDirModel::reload()
 {
-    dirLister()->updateDirectory(dirLister()->url());
+    dirLister()->updateDirectory();
 }
 
 void SortedDirModel::setBlackListedExtensions(const QStringList& list)

diff --git a/gwenview/tests/auto/contextmanagertest.cpp b/gwenview/tests/auto/contextmanagertest.cpp
index b06bcbe..0a5abe8 100644 (file)
--- a/gwenview/tests/auto/contextmanagertest.cpp
+++ b/gwenview/tests/auto/contextmanagertest.cpp
@@ -65,7 +65,7 @@ void ContextManagerTest::testRemove()
 
     // Remove "b", `manager` should select "c"
     sandBox.remove("b");
-    dirModel.dirLister()->updateDirectory(dirUrl);
+    dirModel.dirLister()->updateDirectory();
     while (dirModel.rowCount() == 3) {
         QTest::qWait(100);
     }
@@ -76,7 +76,7 @@ void ContextManagerTest::testRemove()
 
     // Remove "c", `manager` should select "a"
     sandBox.remove("c");
-    dirModel.dirLister()->updateDirectory(dirUrl);
+    dirModel.dirLister()->updateDirectory();
     while (dirModel.rowCount() == 2) {
         QTest::qWait(100);
     }