From 7e8d250fa645db5fb2df27c6203958f24ea122a7 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Thu, 3 Dec 2020 20:40:49 +0100 Subject: [PATCH] qmljs: Simplify code Should not have an impact on the behavior or performance iiuc. Change-Id: I66f7b6773868a114c2c76fb2c0baca92cc58d0a9 Reviewed-by: Kevin Funk --- src/libs/qmljs/qmljsfindexportedcpptypes.cpp | 35 ++++++-------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/src/libs/qmljs/qmljsfindexportedcpptypes.cpp b/src/libs/qmljs/qmljsfindexportedcpptypes.cpp index 6a64af1fc54..1d6b9d285c7 100644 --- a/src/libs/qmljs/qmljsfindexportedcpptypes.cpp +++ b/src/libs/qmljs/qmljsfindexportedcpptypes.cpp @@ -915,30 +915,17 @@ bool FindExportedCppTypes::maybeExportsTypes(const CPlusPlus::Document::Ptr &doc { if (!document->control()) return false; - const QByteArray qmlRegisterSingletonTypeToken("qmlRegisterType"); - const QByteArray qmlRegisterTypeToken("qmlRegisterSingletonType"); - const QByteArray qmlRegisterUncreatableTypeToken("qmlRegisterUncreatableType"); - const QByteArray qmlRegisterUncreatableMetaObjectToken("qmlRegisterUncreatableMetaObject"); - const QByteArray setContextPropertyToken("setContextProperty"); - if (document->control()->findIdentifier( - qmlRegisterTypeToken.constData(), qmlRegisterTypeToken.size())) { - return true; - } - if (document->control()->findIdentifier( - qmlRegisterSingletonTypeToken.constData(), qmlRegisterSingletonTypeToken.size())) { - return true; - } - if (document->control()->findIdentifier( - qmlRegisterUncreatableTypeToken.constData(), qmlRegisterUncreatableTypeToken.size())) { - return true; - } - if (document->control()->findIdentifier( - setContextPropertyToken.constData(), setContextPropertyToken.size())) { - return true; - } - if (document->control()->findIdentifier( - qmlRegisterUncreatableMetaObjectToken.constData(), qmlRegisterUncreatableMetaObjectToken.size())) { - return true; + const QByteArray tokens[] = { + "qmlRegisterSingletonType", + "qmlRegisterType", + "qmlRegisterUncreatableType", + "setContextProperty" + "qmlRegisterUncreatableMetaObject", + }; + for (const QByteArray &token : tokens) { + if (document->control()->findIdentifier(token.constData(), token.size())) { + return true; + } } return false; }