Merge branch 'Applications/18.04'

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

diff --git a/src/kitemviews/private/kdirectorycontentscounterworker.cpp b/src/kitemviews/private/kdirectorycontentscounterworker.cpp
index e649c20e142f3cbaa024b3242862c4afcea0c3d3..e9c954ed9ce32183716bf3f978f36a1ff4780a1b 100644 (file)
--- a/src/kitemviews/private/kdirectorycontentscounterworker.cpp
+++ b/src/kitemviews/private/kdirectorycontentscounterworker.cpp
@@ -21,11 +21,11 @@
 #include "kdirectorycontentscounterworker.h"
 
 // Required includes for subItemsCount():
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     #include <QDir>
 #else
-    #include <dirent.h>
     #include <QFile>
+    #include <qplatformdefs.h>
 #endif
 
 KDirectoryContentsCounterWorker::KDirectoryContentsCounterWorker(QObject* parent) :
@@ -39,7 +39,7 @@ int KDirectoryContentsCounterWorker::subItemsCount(const QString& path, Options
     const bool countHiddenFiles = options & CountHiddenFiles;
     const bool countDirectoriesOnly = options & CountDirectoriesOnly;
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     QDir dir(path);
     QDir::Filters filters = QDir::NoDotAndDotDot | QDir::System;
     if (countHiddenFiles) {
@@ -52,15 +52,15 @@ int KDirectoryContentsCounterWorker::subItemsCount(const QString& path, Options
     }
     return dir.entryList(filters).count();
 #else
-    // Taken from kdelibs/kio/kio/kdirmodel.cpp
+    // Taken from kio/src/widgets/kdirmodel.cpp
     // Copyright (C) 2006 David Faure <faure@kde.org>
 
     int count = -1;
-    DIR* dir = ::opendir(QFile::encodeName(path));
-    if (dir) {  // krazy:exclude=syscalls
+    auto dir = QT_OPENDIR(QFile::encodeName(path));
+    if (dir) {
         count = 0;
-        struct dirent *dirEntry = 0;
-        while ((dirEntry = ::readdir(dir))) {
+        QT_DIRENT *dirEntry = nullptr;
+        while ((dirEntry = QT_READDIR(dir))) {
             if (dirEntry->d_name[0] == '.') {
                 if (dirEntry->d_name[1] == '\0' || !countHiddenFiles) {
                     // Skip "." or hidden files
@@ -83,7 +83,7 @@ int KDirectoryContentsCounterWorker::subItemsCount(const QString& path, Options
                 ++count;
             }
         }
-        ::closedir(dir);
+        QT_CLOSEDIR(dir);
     }
     return count;
 #endif