diff options
Diffstat (limited to 'src/corelib/io/qstorageinfo_win.cpp')
| -rw-r--r-- | src/corelib/io/qstorageinfo_win.cpp | 59 |
1 files changed, 10 insertions, 49 deletions
diff --git a/src/corelib/io/qstorageinfo_win.cpp b/src/corelib/io/qstorageinfo_win.cpp index d594551425..3ee1df9f3c 100644 --- a/src/corelib/io/qstorageinfo_win.cpp +++ b/src/corelib/io/qstorageinfo_win.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Ivan Komissarov <ABBAPOH@gmail.com> -** 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) 2014 Ivan Komissarov <ABBAPOH@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qstorageinfo_p.h" @@ -51,6 +15,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + static const int defaultBufferSize = MAX_PATH + 1; static QString canonicalPath(const QString &rootPath) @@ -59,16 +25,16 @@ static QString canonicalPath(const QString &rootPath) if (path.isEmpty()) return path; - if (path.startsWith(QLatin1String("\\\\?\\"))) + if (path.startsWith("\\\\?\\"_L1)) path.remove(0, 4); - if (path.length() < 2 || path.at(1) != QLatin1Char(':')) + if (path.length() < 2 || path.at(1) != u':') return QString(); path[0] = path[0].toUpper(); if (!(path.at(0).unicode() >= 'A' && path.at(0).unicode() <= 'Z')) return QString(); - if (!path.endsWith(QLatin1Char('\\'))) - path.append(QLatin1Char('\\')); + if (!path.endsWith(u'\\')) + path.append(u'\\'); return path; } @@ -204,11 +170,6 @@ QList<QStorageInfo> QStorageInfoPrivate::mountedVolumes() return volumes; } -QStorageInfo QStorageInfoPrivate::root() -{ - return QStorageInfo(QDir::fromNativeSeparators(QFile::decodeName(qgetenv("SystemDrive")))); -} - bool QStorageInfoPrivate::queryStorageProperty() { QString path = QDir::toNativeSeparators(uR"(\\.\)" + rootPath); @@ -242,14 +203,14 @@ bool QStorageInfoPrivate::queryStorageProperty() nullptr); CloseHandle(handle); if (result) - blockSize = saad.BytesPerPhysicalSector; + blockSize = int(saad.BytesPerPhysicalSector); return result; } struct Helper { QBasicMutex mutex; - QSystemLibrary ntdll {u"ntdll"_qs}; + QSystemLibrary ntdll {u"ntdll"_s}; }; Q_GLOBAL_STATIC(Helper, gNtdllHelper) |