diff options
Diffstat (limited to 'src/corelib/io/qfilesystemwatcher_fsevents.mm')
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher_fsevents.mm | 52 |
1 files changed, 8 insertions, 44 deletions
diff --git a/src/corelib/io/qfilesystemwatcher_fsevents.mm b/src/corelib/io/qfilesystemwatcher_fsevents.mm index b6d285cec3..0d9b84890a 100644 --- a/src/corelib/io/qfilesystemwatcher_fsevents.mm +++ b/src/corelib/io/qfilesystemwatcher_fsevents.mm @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <qplatformdefs.h> @@ -217,8 +181,8 @@ void QFseventsFileSystemWatcherEngine::processEvent(ConstFSEventStreamRef stream lastReceivedEvent = qMax(lastReceivedEvent, eventIds[i]); QString path = QFile::decodeName(eventPaths[i]); - if (path.endsWith(QDir::separator())) - path = path.mid(0, path.size() - 1); + if (path.size() > 1 && path.endsWith(QDir::separator())) + path.chop(1); if (eFlags & kFSEventStreamEventFlagMustScanSubDirs) { DEBUG("\tmust rescan directory because of coalesced events"); @@ -346,8 +310,8 @@ QStringList QFseventsFileSystemWatcherEngine::addPaths(const QStringList &paths, auto sg = qScopeGuard([&]{ unhandled.push_back(path); }); QString origPath = path.normalized(QString::NormalizationForm_C); QString realPath = origPath; - if (realPath.endsWith(QDir::separator())) - realPath = realPath.mid(0, realPath.size() - 1); + if (realPath.size() > 1 && realPath.endsWith(QDir::separator())) + realPath.chop(1); QString watchedPath, parentPath; realPath = QFileInfo(realPath).canonicalFilePath(); @@ -437,8 +401,8 @@ QStringList QFseventsFileSystemWatcherEngine::removePaths(const QStringList &pat for (const QString &origPath : paths) { auto sg = qScopeGuard([&]{ unhandled.push_back(origPath); }); QString realPath = origPath; - if (realPath.endsWith(QDir::separator())) - realPath = realPath.mid(0, realPath.size() - 1); + if (realPath.size() > 1 && realPath.endsWith(QDir::separator())) + realPath.chop(1); QFileInfo fi(realPath); realPath = fi.canonicalFilePath(); |