1 files changed, 13 insertions, 38 deletions

diff --git a/tests/benchmarks/corelib/io/qfile/tst_bench_qfile.cpp b/tests/benchmarks/corelib/io/qfile/tst_bench_qfile.cpp
index e7026c70f9..b805726f5f 100644
--- a/tests/benchmarks/corelib/io/qfile/tst_bench_qfile.cpp
+++ b/tests/benchmarks/corelib/io/qfile/tst_bench_qfile.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** 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-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QDebug>
 #include <QTemporaryFile>
@@ -38,7 +13,7 @@
 #include <stdio.h>
 
 #ifdef Q_OS_WIN
-# include <windows.h>
+# include <qt_windows.h>
 #endif
 
 #if defined(Q_OS_QNX) && defined(open)
@@ -263,7 +238,7 @@ void tst_qfile::readBigFile()
 #ifdef QT_BUILD_INTERNAL
         case QFSFileEngineBenchmark: {
             QFSFileEngine fse(tempDir.filename);
-            fse.open(QIODevice::ReadOnly|textMode|bufferedMode);
+            fse.open(QIODevice::ReadOnly | textMode | bufferedMode, std::nullopt);
             QBENCHMARK {
                 //qWarning() << fse.supportsExtension(QAbstractFileEngine::AtEndExtension);
                 while (fse.read(buffer, blockSize)) {}
@@ -349,7 +324,7 @@ void tst_qfile::seek()
 #ifdef QT_BUILD_INTERNAL
         case QFSFileEngineBenchmark: {
             QFSFileEngine fse(tempDir.filename);
-            fse.open(QIODevice::ReadOnly | QIODevice::Unbuffered);
+            fse.open(QIODevice::ReadOnly | QIODevice::Unbuffered, std::nullopt);
             QBENCHMARK {
                 i=(i+1)%sp_size;
                 fse.seek(seekpos[i]);
@@ -426,7 +401,7 @@ void tst_qfile::open()
         case QFSFileEngineBenchmark: {
             QBENCHMARK {
                 QFSFileEngine fse(tempDir.filename);
-                fse.open(QIODevice::ReadOnly | QIODevice::Unbuffered);
+                fse.open(QIODevice::ReadOnly | QIODevice::Unbuffered, std::nullopt);
                 fse.close();
             }
         }
@@ -533,13 +508,13 @@ void tst_qfile::readSmallFiles()
             }
 
             QBENCHMARK {
-                for (QFile *const file : qAsConst(fileList)) {
+                for (QFile *const file : std::as_const(fileList)) {
                     while (!file->atEnd())
                        file->read(buffer, blockSize);
                 }
             }
 
-            for (QFile *const file : qAsConst(fileList)) {
+            for (QFile *const file : std::as_const(fileList)) {
                 file->close();
                 delete file;
             }
@@ -550,16 +525,16 @@ void tst_qfile::readSmallFiles()
             QList<QFSFileEngine*> fileList;
             for (const QString &file : files) {
                 QFSFileEngine *fse = new QFSFileEngine(tempDir.filePath(file));
-                fse->open(QIODevice::ReadOnly|textMode|bufferedMode);
+                fse->open(QIODevice::ReadOnly | textMode | bufferedMode, std::nullopt);
                 fileList.append(fse);
             }
 
             QBENCHMARK {
-                for (QFSFileEngine *const fse : qAsConst(fileList))
+                for (QFSFileEngine *const fse : std::as_const(fileList))
                     while (fse->read(buffer, blockSize)) {}
             }
 
-            for (QFSFileEngine *const fse : qAsConst(fileList)) {
+            for (QFSFileEngine *const fse : std::as_const(fileList)) {
                 fse->close();
                 delete fse;
             }
@@ -572,14 +547,14 @@ void tst_qfile::readSmallFiles()
                 fileList.append(::fopen(QFile::encodeName(tempDir.filePath(file)).constData(), "rb"));
 
             QBENCHMARK {
-                for (FILE *const cfile : qAsConst(fileList)) {
+                for (FILE *const cfile : std::as_const(fileList)) {
                     while (!feof(cfile))
                         [[maybe_unused]] auto f = ::fread(buffer, blockSize, 1, cfile);
                     ::fseek(cfile, 0, SEEK_SET);
                 }
             }
 
-            for (FILE *const cfile : qAsConst(fileList))
+            for (FILE *const cfile : std::as_const(fileList))
                 ::fclose(cfile);
         }
         break;