]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/kitemviews/private/kdirectorycontentscounterworker.cpp
Exclude m_terminalPanel references when built on Windows
[dolphin.git] / src / kitemviews / private / kdirectorycontentscounterworker.cpp
index e649c20e142f3cbaa024b3242862c4afcea0c3d3..79e134724b0298ea6e5693336078cefd0dabd3e2 100644 (file)
@@ -21,7 +21,7 @@
 #include "kdirectorycontentscounterworker.h"
 
 // Required includes for subItemsCount():
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     #include <QDir>
 #else
     #include <dirent.h>
@@ -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) {
@@ -59,7 +59,7 @@ int KDirectoryContentsCounterWorker::subItemsCount(const QString& path, Options
     DIR* dir = ::opendir(QFile::encodeName(path));
     if (dir) {  // krazy:exclude=syscalls
         count = 0;
-        struct dirent *dirEntry = 0;
+        struct dirent *dirEntry = nullptr;
         while ((dirEntry = ::readdir(dir))) {
             if (dirEntry->d_name[0] == '.') {
                 if (dirEntry->d_name[1] == '\0' || !countHiddenFiles) {