Merge branch 'release/20.12'

[dolphin.git] / src / kitemviews / private / kdirectorycontentscounterworker.cpp

diff --git a/src/kitemviews/private/kdirectorycontentscounterworker.cpp b/src/kitemviews/private/kdirectorycontentscounterworker.cpp
index 59ff471aeee5e804b6ae8fada4bf642d0b602f8b..73799e739678863657d98ada5fdba5d61d1db03f 100644 (file)
--- a/src/kitemviews/private/kdirectorycontentscounterworker.cpp
+++ b/src/kitemviews/private/kdirectorycontentscounterworker.cpp
@@ -35,6 +35,7 @@ KDirectoryContentsCounterWorker::CountResult walkDir(const QString &dirPath,
     auto dir = QT_OPENDIR(QFile::encodeName(dirPath));
     if (dir) {
         count = 0;
+        size = 0;
         QT_STATBUF buf;
 
         while ((dirEntry = QT_READDIR(dir))) {
@@ -109,7 +110,7 @@ KDirectoryContentsCounterWorker::CountResult KDirectoryContentsCounterWorker::su
 
     QT_DIRENT *dirEntry = nullptr;
 
-    auto res = walkDir(QFile::encodeName(path), countHiddenFiles, countDirectoriesOnly, dirEntry, maxRecursiveLevel);
+    auto res = walkDir(path, countHiddenFiles, countDirectoriesOnly, dirEntry, maxRecursiveLevel);
 
     return res;
 #endif
@@ -118,5 +119,5 @@ KDirectoryContentsCounterWorker::CountResult KDirectoryContentsCounterWorker::su
 void KDirectoryContentsCounterWorker::countDirectoryContents(const QString& path, Options options)
 {
     auto res = subItemsCount(path, options);
-    emit result(path, res.count, res.size);
+    Q_EMIT result(path, res.count, res.size);
 }