From 219e40cff8e91e6cf23f9aec5d1dc2f9d7e45577 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Sun, 4 Feb 2018 11:13:34 +0100 Subject: [PATCH] Use qplatformdefs wrappers As recommended by krazy and as kio does. --- .../private/kdirectorycontentscounterworker.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/kitemviews/private/kdirectorycontentscounterworker.cpp b/src/kitemviews/private/kdirectorycontentscounterworker.cpp index 79e134724..e9c954ed9 100644 --- a/src/kitemviews/private/kdirectorycontentscounterworker.cpp +++ b/src/kitemviews/private/kdirectorycontentscounterworker.cpp @@ -24,8 +24,8 @@ #ifdef Q_OS_WIN #include #else - #include #include + #include #endif KDirectoryContentsCounterWorker::KDirectoryContentsCounterWorker(QObject* parent) : @@ -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 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 = 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 @@ -83,7 +83,7 @@ int KDirectoryContentsCounterWorker::subItemsCount(const QString& path, Options ++count; } } - ::closedir(dir); + QT_CLOSEDIR(dir); } return count; #endif -- 2.47.3