Use qplatformdefs wrappers

As recommended by krazy and as kio does.

diff --git a/src/kitemviews/private/kdirectorycontentscounterworker.cpp b/src/kitemviews/private/kdirectorycontentscounterworker.cpp
index 79e134724b0298ea6e5693336078cefd0dabd3e2..e9c954ed9ce32183716bf3f978f36a1ff4780a1b 100644 (file)
--- a/src/kitemviews/private/kdirectorycontentscounterworker.cpp
+++ b/src/kitemviews/private/kdirectorycontentscounterworker.cpp
@@ -24,8 +24,8 @@
 #ifdef Q_OS_WIN
     #include <QDir>
 #else
 #ifdef Q_OS_WIN
     #include <QDir>
 #else

-    #include <dirent.h>

     #include <QFile>
     #include <QFile>

+    #include <qplatformdefs.h>

 #endif
 
 KDirectoryContentsCounterWorker::KDirectoryContentsCounterWorker(QObject* parent) :
 #endif
 
 KDirectoryContentsCounterWorker::KDirectoryContentsCounterWorker(QObject* parent) :


@@ -52,15 +52,15 @@ int KDirectoryContentsCounterWorker::subItemsCount(const QString& path, Options
     }
     return dir.entryList(filters).count();
 #else
     }
     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;
     // 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;
         count = 0;

-        struct dirent *dirEntry = nullptr;
-        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
             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;
             }
         }
                 ++count;
             }
         }

-        ::closedir(dir);
+        QT_CLOSEDIR(dir);

     }
     return count;
 #endif
     }
     return count;
 #endif