summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-08-17 09:44:14 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-08-21 20:23:21 +0000
commit4260287620f4623fe69cea20d738722019439685 (patch)
tree9f2b8f64a6ed1b96a699a9fa0ce97ab09750841e
parent96fea6e1422c7187c50e6cea12b60657364563a0 (diff)
QAbstractFileEngine: port indexed to ranged loop
... fixing a int/qsizetype mismatch in the process. As a drive-by, replace SESE with an early return. Task-number: QTBUG-103525 Change-Id: I961728ba818c4cb43c0e2c9056c70c8f37ad042e Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> (cherry picked from commit f40679dcdd8278aca5838101b2d4c3c7733ea130) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/corelib/io/qabstractfileengine.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp
index c8f21c5b4c..7eed16d9dd 100644
--- a/src/corelib/io/qabstractfileengine.cpp
+++ b/src/corelib/io/qabstractfileengine.cpp
@@ -123,20 +123,17 @@ QAbstractFileEngineHandler::~QAbstractFileEngineHandler()
*/
QAbstractFileEngine *qt_custom_file_engine_handler_create(const QString &path)
{
- QAbstractFileEngine *engine = nullptr;
-
if (qt_file_engine_handlers_in_use.loadRelaxed()) {
QReadLocker locker(fileEngineHandlerMutex());
// check for registered handlers that can load the file
- QAbstractFileEngineHandlerList *handlers = fileEngineHandlers();
- for (int i = 0; i < handlers->size(); i++) {
- if ((engine = handlers->at(i)->create(path)))
- break;
+ for (QAbstractFileEngineHandler *handler : std::as_const(*fileEngineHandlers())) {
+ if (QAbstractFileEngine *engine = handler->create(path))
+ return engine;
}
}
- return engine;
+ return nullptr;
}
/*!