Merge branch 'release/20.08' into master

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

diff --git a/src/kitemviews/private/kdirectorycontentscounterworker.cpp b/src/kitemviews/private/kdirectorycontentscounterworker.cpp
index 3117d07aa4ea4e6175002bbeec4a812f61661ab5..59ff471aeee5e804b6ae8fada4bf642d0b602f8b 100644 (file)
--- a/src/kitemviews/private/kdirectorycontentscounterworker.cpp
+++ b/src/kitemviews/private/kdirectorycontentscounterworker.cpp
@@ -1,22 +1,9 @@
-/***************************************************************************
- *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
- *   Copyright (C) 2013 by Frank Reininghaus <frank78ac@googlemail.com>    *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2011 Peter Penz <peter.penz19@gmail.com>
+ * SPDX-FileCopyrightText: 2013 Frank Reininghaus <frank78ac@googlemail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "kdirectorycontentscounterworker.h"
 
@@ -36,6 +23,7 @@ KDirectoryContentsCounterWorker::KDirectoryContentsCounterWorker(QObject* parent
     qRegisterMetaType<KDirectoryContentsCounterWorker::Options>();
 }
 
+#ifndef Q_OS_WIN
 KDirectoryContentsCounterWorker::CountResult walkDir(const QString &dirPath,
                                                      const bool countHiddenFiles,
                                                      const bool countDirectoriesOnly,
@@ -96,6 +84,7 @@ KDirectoryContentsCounterWorker::CountResult walkDir(const QString &dirPath,
     }
     return KDirectoryContentsCounterWorker::CountResult{count, size};
 }
+#endif
 
 KDirectoryContentsCounterWorker::CountResult KDirectoryContentsCounterWorker::subItemsCount(const QString& path, Options options)
 {