kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 17:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use qplatformdefs wrappers

Browse source 
As recommended by krazy and as kio does.
This commit is contained in:
Elvis Angelaccio 2018-02-04 11:13:34 +01:00
parent 56b132fff0
commit 219e40cff8
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/kitemviews/private/kdirectorycontentscounterworker.cpp
View file

@ -24,8 +24,8 @@
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <QDir> #include <QDir>
#else #else
#include <dirent.h>
#include <QFile> #include <QFile>
#include <qplatformdefs.h>
#endif #endif
KDirectoryContentsCounterWorker::KDirectoryContentsCounterWorker(QObject* parent) : KDirectoryContentsCounterWorker::KDirectoryContentsCounterWorker(QObject* parent) :
@ -52,15 +52,15 @@ int KDirectoryContentsCounterWorker::subItemsCount(const QString& path, Options
} }
return dir.entryList(filters).count(); return dir.entryList(filters).count();
#else #else
// Taken from kdelibs/kio/kio/kdirmodel.cpp // Taken from kio/src/widgets/kdirmodel.cpp
// Copyright (C) 2006 David Faure <faure@kde.org> // Copyright (C) 2006 David Faure <faure@kde.org>
int count = -1; int count = -1;
DIR* dir = ::opendir(QFile::encodeName(path)); auto dir = QT_OPENDIR(QFile::encodeName(path));
if (dir) { // krazy:exclude=syscalls if (dir) {
count = 0; count = 0;
struct dirent *dirEntry = nullptr; QT_DIRENT *dirEntry = nullptr;
while ((dirEntry = ::readdir(dir))) { while ((dirEntry = QT_READDIR(dir))) {
if (dirEntry->d_name[0] == '.') { if (dirEntry->d_name[0] == '.') {
if (dirEntry->d_name[1] == '\0' || !countHiddenFiles) { if (dirEntry->d_name[1] == '\0' || !countHiddenFiles) {
// Skip "." or hidden files // Skip "." or hidden files
@ -83,7 +83,7 @@ int KDirectoryContentsCounterWorker::subItemsCount(const QString& path, Options
++count; ++count;
} }
} }
::closedir(dir); QT_CLOSEDIR(dir);
} }
return count; return count;
#endif #endif